[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. #46411

zhangheihei · 2024-05-29T11:51:04Z

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

Does this PR entail a change in behavior?

Yes, this PR will result in a change in behavior.
No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

Interface/UI changes: syntax, type conversion, expression evaluation, display information
Parameter changes: default values, similar parameters but with different default values
Policy changes: use new policy to replace old one, functionality automatically enabled
Feature removed
Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

I have added test cases for my bug fix or my new feature
This pr needs user documentation (for new or modified features or behaviors)
- I have added documentation for my new feature or new function
This is a backport pr

Bugfix cherry-pick branch check:

starrocks-cr · 2024-05-29T11:51:46Z

fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollectionV2.java

@@ -279,7 +287,7 @@ public void merge(PrivilegeCollectionV2 other) {
            } else {
                List<PrivilegeEntry> typeList = typeToPrivilegeEntryList.get(typeId);
                for (PrivilegeEntry entry : otherList) {
-                    grantObjectToList(entry.actionSet, entry.object, entry.withGrantOption, typeList);
+                    grantObjectToList(entry.actionSet, entry.object, entry.withGrantOption, typeList, true);
                } // for privilege entry in other.list
            }
        } // for typeId, privilegeEntryList in other


The most risky bug in this code is:
Mixing semantics of isGrant with deep/shallow copy logic potentially leads to incorrect privilege management.

You can modify the code like this:

- grantObjectToList(entry.actionSet, entry.object, entry.withGrantOption, typeList); + grantObjectToList(entry.actionSet, entry.object, entry.withGrantOption, typeList, true);

Specifically, ensure isDeepCopy parameter usage is consistent and aligned with the intention behind cloning or referencing ActionSet objects. This change ensures that whenever we're merging privileges from one collection to another (merge method), we're consciously deciding whether to clone (isDeepCopy = true) or merely reference (isDeepCopy = false) the ActionSet, preventing accidental state manipulation across different privilege entries.

…ge dropped. Signed-off-by: edwinhzhang <[email protected]>

sonarcloud · 2024-05-30T09:39:34Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

github-actions · 2024-05-30T11:36:04Z

[BE Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

github-actions · 2024-05-30T11:36:09Z

[FE Incremental Coverage Report]

✅ pass : 2 / 2 (100.00%)

file detail

	path	covered_line	new_line	coverage	not_covered_line_detail
🔵	com/starrocks/privilege/PrivilegeCollectionV2.java	2	2	100.00%	[]

zhangheihei · 2024-06-03T02:30:21Z

hi @nshangyiming plz reivew the code

github-actions · 2024-06-03T08:55:44Z

@Mergifyio backport branch-3.3

github-actions · 2024-06-03T08:55:45Z

@Mergifyio backport branch-3.2

github-actions · 2024-06-03T08:55:46Z

@Mergifyio backport branch-3.1

github-actions · 2024-06-03T08:55:48Z

@Mergifyio backport branch-3.0

github-actions · 2024-06-03T08:55:49Z

@Mergifyio backport branch-2.5

mergify · 2024-06-03T08:55:53Z

backport branch-3.3

✅ Backports have been created

#46566 [BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) has been created for branch branch-3.3

mergify · 2024-06-03T08:55:54Z

backport branch-3.2

✅ Backports have been created

#46567 [BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) has been created for branch branch-3.2

mergify · 2024-06-03T08:55:56Z

backport branch-3.1

✅ Backports have been created

#46568 [BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) has been created for branch branch-3.1

mergify · 2024-06-03T08:55:57Z

backport branch-3.0

✅ Backports have been created

#46569 [BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) has been created for branch branch-3.0

mergify · 2024-06-03T08:55:58Z

backport branch-2.5

✅ Backports have been created

#46570 [BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) has been created for branch branch-2.5 but encountered conflicts

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9)

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9) # Conflicts: # fe/fe-core/src/main/java/com/starrocks/privilege/PrivilegeCollection.java

…e dropped. (backport #46411) (#46566) Co-authored-by: zhanghe <[email protected]>

…e dropped. (backport #46411) (#46568) Co-authored-by: zhanghe <[email protected]>

…e dropped. (backport #46411) (#46569) Co-authored-by: zhanghe <[email protected]>

…e dropped. (backport #46411) (#46567) Co-authored-by: zhanghe <[email protected]>

zhangheihei requested a review from a team as a code owner May 29, 2024 11:51

starrocks-cr bot reviewed May 29, 2024

View reviewed changes

mergify bot assigned zhangheihei May 29, 2024

github-actions bot added behavior_changed 3.3 3.2 3.1 3.0 2.5 labels May 29, 2024

zhangheihei force-pushed the fix-privilegemerge branch from 034d314 to bf9f4ed Compare May 29, 2024 12:21

nshangyiming assigned HangyuanLiu and nshangyiming May 30, 2024

zhangheihei added 2 commits May 30, 2024 17:30

[BugFix] Fix an issue when the privilege is merged,casue root privile…

fbb139a

…ge dropped. Signed-off-by: edwinhzhang <[email protected]>

[BugFix] Fix an issue when the privilege is merged,casue root privile…

74baba2

…ge dropped. Signed-off-by: edwinhzhang <[email protected]>

zhangheihei force-pushed the fix-privilegemerge branch from dde1190 to 74baba2 Compare May 30, 2024 09:31

HangyuanLiu approved these changes Jun 3, 2024

View reviewed changes

nshangyiming approved these changes Jun 3, 2024

View reviewed changes

nshangyiming merged commit 2391dd9 into StarRocks:main Jun 3, 2024
82 of 89 checks passed

github-actions bot removed the 3.3 label Jun 3, 2024

github-actions bot removed 3.2 3.1 labels Jun 3, 2024

github-actions bot removed the 3.0 label Jun 3, 2024

github-actions bot removed the 2.5 label Jun 3, 2024

mergify bot pushed a commit that referenced this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

e552a26

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9)

mergify bot mentioned this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46566

Merged

42 tasks

mergify bot pushed a commit that referenced this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

0c14d35

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9)

mergify bot mentioned this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46567

Merged

18 tasks

mergify bot pushed a commit that referenced this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

f126c1e

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9)

mergify bot mentioned this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46568

Merged

42 tasks

mergify bot pushed a commit that referenced this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

ec09cf8

…e dropped. (#46411) Signed-off-by: edwinhzhang <[email protected]> (cherry picked from commit 2391dd9)

mergify bot mentioned this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46569

Merged

42 tasks

mergify bot mentioned this pull request Jun 3, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. (backport #46411) #46570

Closed

42 tasks

wanpengfei-git pushed a commit that referenced this pull request Jun 4, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

1233291

…e dropped. (backport #46411) (#46566) Co-authored-by: zhanghe <[email protected]>

github-actions bot added the 3.3-merged label Jun 4, 2024

wanpengfei-git pushed a commit that referenced this pull request Jun 4, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

48a3bd0

…e dropped. (backport #46411) (#46568) Co-authored-by: zhanghe <[email protected]>

github-actions bot added the 3.1-merged label Jun 4, 2024

wanpengfei-git pushed a commit that referenced this pull request Jun 4, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

b23e8f1

…e dropped. (backport #46411) (#46569) Co-authored-by: zhanghe <[email protected]>

github-actions bot added the 3.0-merged label Jun 4, 2024

wanpengfei-git pushed a commit that referenced this pull request Jun 7, 2024

[BugFix] Fix an issue when the privilege is merged,casue root privilg…

630c169

…e dropped. (backport #46411) (#46567) Co-authored-by: zhanghe <[email protected]>

github-actions bot added 3.2-merged 3.3 3.2 3.1 3.0 labels Jun 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. #46411

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. #46411

zhangheihei commented May 29, 2024 •

edited by HangyuanLiu

Loading

starrocks-cr bot May 29, 2024

sonarcloud bot commented May 30, 2024

github-actions bot commented May 30, 2024

github-actions bot commented May 30, 2024

zhangheihei commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. #46411

[BugFix] Fix an issue when the privilege is merged,casue root privilge dropped. #46411

Conversation

zhangheihei commented May 29, 2024 • edited by HangyuanLiu Loading

Why I'm doing:

What I'm doing:

What type of PR is this:

Checklist:

Bugfix cherry-pick branch check:

starrocks-cr bot May 29, 2024

Choose a reason for hiding this comment

sonarcloud bot commented May 30, 2024

Quality Gate passed

github-actions bot commented May 30, 2024

[BE Incremental Coverage Report]

github-actions bot commented May 30, 2024

[FE Incremental Coverage Report]

file detail

zhangheihei commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

github-actions bot commented Jun 3, 2024

mergify bot commented Jun 3, 2024 • edited Loading

✅ Backports have been created

mergify bot commented Jun 3, 2024 • edited Loading

✅ Backports have been created

mergify bot commented Jun 3, 2024 • edited Loading

✅ Backports have been created

mergify bot commented Jun 3, 2024 • edited Loading

✅ Backports have been created

mergify bot commented Jun 3, 2024 • edited Loading

✅ Backports have been created

zhangheihei commented May 29, 2024 •

edited by HangyuanLiu

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading

mergify bot commented Jun 3, 2024 •

edited

Loading