Skip to content

fix: Update security context via reactive context repository instead of directly updating session attributes #40892

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jun 9, 2025
Merged

fix: Update security context via reactive context repository instead of directly updating session attributes #40892

merged 2 commits into from
Jun 9, 2025

Conversation

abhvsn
Copy link
Contributor

@abhvsn abhvsn commented Jun 9, 2025 •
edited by github-actions bot
Loading

Description

This PR fixes the security context persistence mechanism in the email verification flow. Previously, the code was directly manipulating the session attributes to store the security context, which is not the recommended approach in Spring WebFlux applications. We've updated the implementation to use the proper ServerSecurityContextRepository for persisting the security context.

Changes

Existing implementation:

session.getAttributes().put(DEFAULT_SPRING_SECURITY_CONTEXT_ATTR_NAME, securityContext);

Drawbacks:

  • Bypassed Spring Security's security context management
  • Didn't properly integrate with reactive patterns
  • Could lead to session consistency issues
  • Wasn't compatible with different security context storage strategies

Updated implementation:

ServerSecurityContextRepository contextRepository = new WebSessionServerSecurityContextRepository();
return contextRepository.save(exchange, securityContext)
    .then(repository.save(user));

Advantages:

  • Proper integration with Spring Security's reactive architecture
  • Thread-safe security context persistence
  • Better session management
  • Future compatibility with different session storage mechanisms

Ref thread: https://theappsmith.slack.com/archives/C02K2MZERSL/p1749434009167839

/test Authentication,Email

🔍 Cypress test results

Tip

🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
Workflow run: https://github.com/appsmithorg/appsmith/actions/runs/15532462184
Commit: 4244587
Cypress dashboard.
Tags: @tag.Authentication, @tag.Email
Spec:

Mon, 09 Jun 2025 10:49:28 UTC

Communication

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

  • Yes
  • No

Summary by CodeRabbit

  • Bug Fixes
    • Improved email verification process for a more reliable and consistent user authentication experience.

@coderabbitai coderabbitai
Copy link
Contributor

coderabbitai bot commented Jun 9, 2025 •
edited
Loading

Walkthrough

The change updates the email verification process in the user service implementation. It replaces direct session attribute manipulation with a reactive approach using a security context repository to save authentication context, chaining user and security context saves before redirecting.

Changes

File(s) Change Summary
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java Refactored email verification token logic to use ServerSecurityContextRepository for session management instead of direct session attribute manipulation; updated control flow accordingly.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant UserServiceCEImpl
    participant SecurityContextRepository
    participant UserRepository
    participant WebSession

    User->>UserServiceCEImpl: Submit email verification token
    UserServiceCEImpl->>UserRepository: Validate token & user
    UserServiceCEImpl->>UserRepository: Set email as verified
    UserServiceCEImpl->>SecurityContextRepository: Save security context in session
    SecurityContextRepository->>WebSession: Store context
    UserServiceCEImpl->>UserRepository: Save updated user
    UserServiceCEImpl->>User: Redirect to target page
Loading

Poem

In the land of sessions, a change takes flight,
No more attributes set in the night.
The context now saved, in a reactive stream,
Security flows, as smooth as a dream.
With tokens verified and redirects in sight,
The code marches on, robust and light!

📜 Recent review details

Configuration used: .coderabbit.yaml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 99db0a1 and 4244587.

📒 Files selected for processing (1)
  • app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java (2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: server-unit-tests / server-unit-tests
  • GitHub Check: server-spotless / spotless-check
🔇 Additional comments (4)
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java (4)

56-57: LGTM: Appropriate imports for reactive security context handling.

The new imports support the transition from direct session manipulation to proper Spring Security reactive patterns.

1003-1003: LGTM: Email verification status updated correctly.

Setting emailVerified to TRUE before authentication setup is the correct sequence.

1007-1010: Excellent refactor: Reactive security context repository replaces direct session manipulation.

This change properly uses Spring Security's reactive patterns instead of directly manipulating session attributes. The WebSessionServerSecurityContextRepository is the appropriate choice for web session-based security context storage.

1011-1013: Good operation chaining: Security context and user saves properly sequenced.

The chaining ensures that:

  1. Security context is saved to session first
  2. User is saved to database second
  3. Redirect occurs only after both operations complete successfully

This maintains data consistency and follows reactive patterns correctly.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @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.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.

@github-actions github-actions bot added the Bug Something isn't working label Jun 9, 2025
@abhvsn abhvsn added the ok-to-test Required label for CI label Jun 9, 2025
@abhvsn abhvsn merged commit 2d890df into release Jun 9, 2025
56 checks passed
@abhvsn abhvsn deleted the fix/context-update-via-reactive-method branch June 9, 2025 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trishaanand trishaanand trishaanand approved these changes

@NilanshBansal NilanshBansal NilanshBansal approved these changes

Assignees
No one assigned
Labels
Bug Something isn't working ok-to-test Required label for CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@abhvsn @trishaanand @NilanshBansal