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: xframe value type #5336

Merged
merged 3 commits into from
Jul 4, 2024
Merged

fix: xframe value type #5336

merged 3 commits into from
Jul 4, 2024

Conversation

hongzzz
Copy link

@hongzzz hongzzz commented Jul 3, 2024

Checklist
  • npm test passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)
Description of change

Fix xframe option type in index.d.ts.
Closes #5306

Summary by CodeRabbit

  • New Features
    • Enhanced the xframe configuration in the security module, allowing dynamic URLs with ALLOW-FROM. This flexibility enables more specific content embedding policies.

Copy link

coderabbitai bot commented Jul 3, 2024

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Walkthrough

Recent changes in the index.d.ts file have altered the xframe value in the egg module to support dynamic string interpolation for ALLOW-FROM values. This enhancement addresses the limitation where TypeScript validation would fail when ALLOW-FROM followed by any URL was used. The new format ensures compatibility and flexibility.

Changes

File Change Summary
index.d.ts Updated xframe value in the egg module to allow for dynamic string interpolation by modifying the type definition from `value: 'SAMEORIGIN'

Sequence Diagram(s)

N/A

Assessment against linked issues

Objective Addressed Explanation
#5306: Ensure xframe.value can accept ALLOW-FROM followed by any URL

Poem

In the code, a tweak we made,
To fix a quirk, a bug forbade.
Now ALLOW-FROM with URLs so grand,
Simplifies our tasks at hand.
Code evolves, and we delight,
With TypeScript clearer, pure and bright.


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>.
    • 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 show all the console.log statements in this repository.
    • @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 as 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.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration 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

@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: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 4a4d056 and 6897d10.

Files selected for processing (1)
  • index.d.ts (1 hunks)
Additional comments not posted (1)
index.d.ts (1)

519-519: Correct the TypeScript type declaration for xframe.value.

The change correctly updates the type to include a template literal type, allowing ALLOW-FROM ${string}. This addresses the issue where ALLOW-FROM followed by a URL was not accepted.

index.d.ts Outdated Show resolved Hide resolved
@hongzzz hongzzz requested a review from fengmk2 July 3, 2024 15:30
@fengmk2 fengmk2 changed the base branch from master to 3.x July 3, 2024 15:38
@fengmk2
Copy link
Member

fengmk2 commented Jul 3, 2024

先合并到 3.x 分支

@fengmk2 fengmk2 merged commit 872273c into eggjs:3.x Jul 4, 2024
19 checks passed
@fengmk2
Copy link
Member

fengmk2 commented Jul 4, 2024

@coderabbitai 创建一个 issue 跟进此 pr 后续会被合并到 master 分支

Copy link

coderabbitai bot commented Jul 4, 2024

@fengmk2 已经创建了一个 issue 来跟进此 PR 以后合并到 master 分支的情况。可以在 issue #5337 查看详细信息。

Analysis chain

@fengmk2 明白了,我会创建一个 issue 来跟进这个 PR 以后合并到 master 分支的情况。

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
gh issue create --title "Track merging PR #5336 into master branch" --body "This issue is created to track the merging of [PR #5336](https://github.com/eggjs/egg/pull/5336) into the master branch. The PR fixes the xframe option type in \`index.d.ts\` as described in [issue #5306](https://github.com/eggjs/egg/issues/5306). 

Please ensure that this PR is merged into the master branch after it has been merged into the 3.x branch.

PR details:
- **Title:** fix: xframe value type
- **User:** hongzzz
- **Number:** 5336
- **Description:** Fixes the xframe option type in \`index.d.ts\`.
- **Checklist:**
  - [x] \`npm test\` passes
  - [ ] Tests and/or benchmarks are included
  - [ ] Documentation is changed or added
  - [ ] Commit message follows commit guidelines

Linked issue: [#5306](https://github.com/eggjs/egg/issues/5306)" --assignee fengmk2

Length of output: 889

Actions performed

Comments resolved.

@fengmk2
Copy link
Member

fengmk2 commented Jul 4, 2024

  • egg@3.26.1

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

Successfully merging this pull request may close these issues.

index.d.ts关于xframe.value的声明中“ALLOW-FROM”有问题
2 participants