Skip to content
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

fix: NPE for policies when policyMap is not present #36323

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Conversation

abhvsn
Copy link
Contributor

@abhvsn abhvsn commented Sep 15, 2024

Description

/test all

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/10878646145
Commit: 5bbb0ad
Cypress dashboard.
Tags: @tag.All
Spec:


Mon, 16 Sep 2024 07:32:37 UTC

Communication

Should the DevRel and Marketing teams inform users about this change?

  • Yes
  • No

Summary by CodeRabbit

  • Bug Fixes
    • Improved the reliability of policies retrieval methods to prevent null values, ensuring they always return a non-null result.
  • New Features
    • Enhanced API design with safer handling of collections by returning an empty set when no policies are available.

@abhvsn abhvsn added the ok-to-test Required label for CI label Sep 15, 2024
Copy link
Contributor

coderabbitai bot commented Sep 15, 2024

Walkthrough

The change involves modifying the getPolicies() method in the BaseDomain class to ensure it returns an empty set instead of null when the policyMap is null. Additionally, several methods across different classes have been updated to include null checks for user policies, creating empty sets when policies are absent. These adjustments enhance the reliability of the code by consistently providing non-null return values, thereby reducing the risk of NullPointerExceptions.

Changes

File Change Summary
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java Modified getPolicies() to return an empty set using Set.of() instead of null when policyMap is null.
app/server/src/main/java/com/appsmith/server/migrations/db/ce/Migration028TagUserManagementRolesWithoutDefaultDomainTypeAndId.java Added a null check for user policies, creating an empty Set if policies are null.
app/server/src/main/java/com/appsmith/server/migrations/db/ce/Migration025RemoveUnassignPermissionFromUnnecessaryRoles.java Introduced a null check for policies, ensuring an empty set is created if getPolicies() returns null.
app/server/src/main/java/com/appsmith/server/migrations/db/ce/Migration029PopulateDefaultDomainIdInUserManagementRoles.java Implemented a null check for user policies, initializing an empty set if policies are absent.
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PermissionGroupServiceCEImpl.java Added a null check for policies in the isEntityAccessible method, ensuring a valid set is used.
app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java Modified createJsAction to check for null policies, initializing to an empty set if necessary.
app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/UserPermissionUtils.java Added a null check for policies in the permission validation logic, ensuring a valid set is used.
app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java Introduced a null check for the policySet parameter, returning an empty HashSet if it is null.

Possibly related PRs

  • fix: NPE while creating a policies copy #36172: This PR modifies the setUserPermissionsInObject method to ensure that policies are initialized to an empty set if getPolicies() returns null, similar to the changes made in the getPolicies() method of the BaseDomain class in the main PR.
  • fix: fixed page data DB call getting called twice #36247: The changes in this PR also involve handling null policies by ensuring that an empty set is created when policies are null, which aligns with the robustness improvements in the main PR.

Poem

In code we trust, with policies clear,
An empty set now brings us cheer.
No more nulls to cause dismay,
Robust and safe, we code away!
With every change, our code will sing,
A safer world, this fix will bring! 🎉


Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 435c4e6 and 5bbb0ad.

Files selected for processing (1)
  • app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java (1 hunks)
Additional comments not posted (1)
app/server/appsmith-server/src/main/java/com/appsmith/server/acl/ce/PolicyGeneratorCE.java (1)

320-322: Excellent work on adding the null check, my dear student!

The null check for the policySet parameter is a splendid addition to the getAllChildPolicies method. It showcases your understanding of defensive programming practices and ensures that the method handles the case when no policies are provided gracefully. By returning an empty HashSet instead of proceeding with the existing logic, you prevent potential NullPointerException errors and maintain a consistent return type. This change enhances the robustness and reliability of the code. Well done!


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    -- I pushed a fix in commit <commit_id>, please review it.
    -- Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    -- @coderabbitai generate unit testing code for this file.
    -- @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    -- @coderabbitai generate interesting stats about this repository and render them as a table.
    -- @coderabbitai read src/utils.ts and generate unit testing code.
    -- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    -- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@abhvsn abhvsn requested a review from AnaghHegde September 15, 2024 17:20
@github-actions github-actions bot added the Bug Something isn't working label Sep 15, 2024
AnaghHegde
AnaghHegde previously approved these changes Sep 16, 2024
Copy link
Member

@AnaghHegde AnaghHegde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this for the NPE we are seeing in 4517?

@abhvsn abhvsn requested a review from AnaghHegde September 16, 2024 08:14
@abhvsn abhvsn merged commit 4c7ce27 into release Sep 16, 2024
82 checks passed
@abhvsn abhvsn deleted the abhvsn-patch-2 branch September 16, 2024 09:20
Shivam-z pushed a commit to Shivam-z/appsmith that referenced this pull request Sep 26, 2024
)

## Description

/test all

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/10878646145>
> Commit: 5bbb0ad
> <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10878646145&attempt=1"
target="_blank">Cypress dashboard</a>.
> Tags: `@tag.All`
> Spec:
> <hr>Mon, 16 Sep 2024 07:32:37 UTC
<!-- end of auto-generated comment: Cypress test results  -->


## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Bug Fixes**
- Improved the reliability of policies retrieval methods to prevent null
values, ensuring they always return a non-null result.
- **New Features**
- Enhanced API design with safer handling of collections by returning an
empty set when no policies are available.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working ok-to-test Required label for CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants