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: Adaptor middleware duplicates cookies #3151

Merged
merged 3 commits into from
Oct 3, 2024

Conversation

sigmundxia
Copy link
Contributor

Description

In adapter.go, add a step to clear existing cookies before introducing new ones in the HTTPMiddleware section, so that cookies are not duplicated after passing through the middleware.

Fixes #3089

Type of change

  • Code consistency (non-breaking change which improves code reliability and robustness)

Checklist

Before you submit your pull request, please make sure you meet these requirements:

  • Followed the inspiration of the Express.js framework for new functionalities, making them similar in usage.
  • Conducted a self-review of the code and provided comments for complex or critical parts.
  • Updated the documentation in the /docs/ directory for Fiber's documentation.
  • Added or updated unit tests to validate the effectiveness of the changes or new features.
  • Ensured that new and existing unit tests pass locally with the changes.
  • Verified that any new dependencies are essential and have been agreed upon by the maintainers/community.
  • Aimed for optimal performance with minimal allocations in the new code.
  • Provided benchmarks for the new code to analyze and improve upon.

Commit formatting

Please use emojis in commit messages for an easy way to identify the purpose or intention of a commit. Check out the emoji cheatsheet here: CONTRIBUTING.md

@sigmundxia sigmundxia requested a review from a team as a code owner September 26, 2024 02:38
@sigmundxia sigmundxia requested review from gaby, sixcolors, ReneWerner87 and efectn and removed request for a team September 26, 2024 02:38
Copy link

welcome bot commented Sep 26, 2024

Thanks for opening this pull request! 🎉 Please check out our contributing guidelines. If you need help or want to chat with us, join us on Discord https://gofiber.io/discord

Copy link
Contributor

coderabbitai bot commented Sep 26, 2024

Walkthrough

The changes introduce a modification to the HTTPMiddleware function in the middleware/adaptor/adaptor.go file to prevent cookie duplication by removing all cookies from the request header before processing. Additionally, a new test function, Test_HTTPMiddlewareWithCookies, is added to verify the middleware's behavior when handling cookies, ensuring that the response correctly includes the expected cookies when a POST request is made. The test also covers scenarios for GET requests and POST requests without cookies.

Changes

Files Change Summary
middleware/adaptor/adaptor.go Added a line in HTTPMiddleware to remove all cookies from the request header before setting new headers.
middleware/adaptor/adaptor_test.go Introduced Test_HTTPMiddlewareWithCookies to test the middleware's handling of cookies, ensuring proper response with expected cookies for POST requests, and added test cases for GET and POST without cookies.

Assessment against linked issues

Objective Addressed Explanation
Cookies should not be duplicated within the header. (#3089)

🐰 In the land of code so bright,
A middleware fix brings delight.
No more cookies stacked in a row,
Just clean headers, watch them flow!
With tests in place, all's well and right,
Hopping along, we code through the night! 🌟


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 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 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.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

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.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 0c1f5ff and e1d0385.

📒 Files selected for processing (2)
  • middleware/adaptor/adaptor.go (1 hunks)
  • middleware/adaptor/adaptor_test.go (2 hunks)
🔇 Additional comments not posted (1)
middleware/adaptor/adaptor.go (1)

104-105: Approve the change with suggestions for improvement

The addition of c.Request().Header.DelAllCookies() effectively addresses the issue of cookie duplication described in the PR objectives. This change aligns with the fix proposed in the linked issue #3089.

Consider adding a more detailed comment explaining why this step is necessary. For example:

- // Remove all cookies before setting, see https://github.com/valyala/fasthttp/pull/1864
+ // Remove all cookies before setting new ones to prevent duplication.
+ // This addresses an issue where the adaptor middleware was causing cookie duplication.
+ // For more details, see: https://github.com/gofiber/fiber/issues/3089
+ // and https://github.com/valyala/fasthttp/pull/1864

To ensure this change doesn't have unintended side effects, please verify that other parts of the application aren't relying on the presence of the original cookies at this point in the middleware chain. Run the following script to check for any other references to cookies in the codebase:

This will help identify any potential areas that might be affected by this change.

✅ Verification successful

Change Verified Successfully

The addition of c.Request().Header.DelAllCookies() in the HTTPMiddleware function effectively addresses the issue of cookie duplication as described in the PR objectives. Thorough searches across the codebase indicate that this change does not negatively impact other parts of the application.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Search for other references to cookies in the codebase

echo "Searching for other references to cookies in the codebase:"
rg --type go -i 'cookie'

echo "\nSearching for uses of the HTTPMiddleware function:"
rg --type go 'HTTPMiddleware'

Length of output: 80700

middleware/adaptor/adaptor_test.go Outdated Show resolved Hide resolved
@gaby gaby added this to the v3 milestone Sep 26, 2024
Copy link

codecov bot commented Sep 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.09%. Comparing base (44cd700) to head (e297625).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3151   +/-   ##
=======================================
  Coverage   80.09%   80.09%           
=======================================
  Files         117      117           
  Lines        9043     9044    +1     
=======================================
+ Hits         7243     7244    +1     
  Misses       1365     1365           
  Partials      435      435           
Flag Coverage Δ
unittests 80.09% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between e1d0385 and ee552ce.

📒 Files selected for processing (1)
  • middleware/adaptor/adaptor_test.go (2 hunks)
🔇 Additional comments not posted (5)
middleware/adaptor/adaptor_test.go (5)

204-232: LGTM: Constants and middleware setup look good.

The constant definitions and middleware setup are well-structured and clear. The use of constants for cookie names and values improves readability and maintainability.


234-255: LGTM: Test case for POST request with cookies is well-implemented.

The test case correctly sets up the request with cookies, sends it to the app, and verifies the response. The assertions are comprehensive, checking both the number of cookies and their individual values.


257-265: LGTM: Test case for GET request is correctly implemented.

This test case verifies that the middleware correctly returns a 405 Method Not Allowed status for GET requests, which aligns with the middleware's implementation.


267-276: LGTM: Test case for POST request without cookies is well-implemented.

This test case correctly verifies the behavior when no cookies are present in the request. It checks for a 200 OK status and ensures that no cookies are present in the response.


204-277: Overall, the new test function effectively addresses the PR objectives.

The Test_HTTPMiddlewareWithCookies function successfully tests the behavior of the HTTP middleware with respect to cookie handling. It covers the main scenarios:

  1. POST requests with cookies
  2. GET requests (which should be rejected)
  3. POST requests without cookies

These test cases align well with the PR objective of fixing the issue where cookies were being duplicated after passing through the HTTPMiddleware. The implementation ensures that cookies are correctly processed and returned in the response without duplication.

A minor suggestion for improvement would be to add error handling when setting cookies in the response, as noted in a previous comment. This would further enhance the robustness of the implementation.

Great job on addressing the issue and providing comprehensive test coverage!

middleware/adaptor/adaptor_test.go Show resolved Hide resolved
Copy link
Member

@gaby gaby left a comment

Choose a reason for hiding this comment

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

LGTM

@gaby
Copy link
Member

gaby commented Oct 3, 2024

@ReneWerner87 This is good to merge.

@ReneWerner87 ReneWerner87 merged commit 85a5fb8 into gofiber:main Oct 3, 2024
16 of 17 checks passed
Copy link

welcome bot commented Oct 3, 2024

Congrats on merging your first pull request! 🎉 We here at Fiber are proud of you! If you need help or want to chat with us, join us on Discord https://gofiber.io/discord

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

🐛 [Bug]: Adaptor middleware duplicates cookies
5 participants