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/Project sitemap sharacter escaping #4923

Merged
merged 1 commit into from
Jan 6, 2025
Merged

Conversation

kkatusic
Copy link
Collaborator

@kkatusic kkatusic commented Jan 6, 2025

remove tested XML files, removing console logs, improving escape characters

Summary by CodeRabbit

  • Chores

    • Removed sitemap XML files for users and QF archive
    • Improved XML string sanitization helper function to remove invalid control characters
  • Documentation

    • Updated documentation for XML escaping function to clarify input and output handling
  • Maintenance

    • Removed debug logging in sitemap generation API endpoint

@kkatusic kkatusic self-assigned this Jan 6, 2025
Copy link

vercel bot commented Jan 6, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
giveth-dapps-v2 ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 6, 2025 9:57am

@kkatusic kkatusic requested a review from CarlosQ96 January 6, 2025 09:52
Copy link
Contributor

coderabbitai bot commented Jan 6, 2025

Walkthrough

The pull request involves removing debug logging in an API file, deleting two sitemap XML files, and enhancing the XML escaping utility function. The changes focus on cleaning up logging statements, removing existing sitemap files, and improving XML character sanitization by adding a mechanism to remove invalid control characters before escaping XML-specific special characters.

Changes

File Change Summary
pages/api/generate-sitemap.ts Removed console.log statements from getUsers function, eliminating debug logging
public/sitemap/qf-sitemap.xml Completely removed XML sitemap file for "qf-archive"
public/sitemap/users-sitemap.xml Completely removed XML sitemap file for user profiles
src/helpers/xml.ts Enhanced escapeXml function to remove invalid control characters before XML escaping

Poem

🐰 Sitemap cleanup, logs be gone!
XML escaping, a rabbit's song
Control chars vanish with a leap
Clean code makes my bunny heart keep
Hopping through lines with pure delight 🌟


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 generate docstrings to generate docstrings for this PR. (Beta)
  • @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: 0

🧹 Nitpick comments (1)
src/helpers/xml.ts (1)

Line range hint 18-28: Consider additional improvements for robustness.

While the implementation is correct, consider these enhancements:

  1. Extract the regex pattern as a named constant for better maintainability
  2. Add input validation for undefined or null
  3. Consider handling additional XML restrictions (e.g., Unicode surrogate pairs)

Here's a suggested implementation:

+ const INVALID_XML_CONTROL_CHARS = /[\x00-\x08\x0B\x0C\x0E-\x1F]/g;
+
 export function escapeXml(unsafe: string): string {
+   if (unsafe == null) return '';
+
 	// Remove invalid XML characters
-	const sanitized = unsafe.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, '');
+	const sanitized = unsafe.replace(INVALID_XML_CONTROL_CHARS, '');

 	// Escape XML special characters
 	return sanitized
 		.replace(/&/g, '&amp;')
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 		.replace(/"/g, '&quot;')
 		.replace(/'/g, '&apos;');
 }
🧰 Tools
🪛 Biome (1.9.4)

[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2016ad6 and 244ab98.

📒 Files selected for processing (4)
  • pages/api/generate-sitemap.ts (0 hunks)
  • public/sitemap/qf-sitemap.xml (0 hunks)
  • public/sitemap/users-sitemap.xml (0 hunks)
  • src/helpers/xml.ts (1 hunks)
💤 Files with no reviewable changes (3)
  • public/sitemap/qf-sitemap.xml
  • public/sitemap/users-sitemap.xml
  • pages/api/generate-sitemap.ts
🧰 Additional context used
🪛 Biome (1.9.4)
src/helpers/xml.ts

[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)

⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: build
🔇 Additional comments (2)
src/helpers/xml.ts (2)

11-15: Well-documented changes!

The documentation clearly describes the control character handling and provides comprehensive details about the function's behavior.


18-19: Implementation looks good, static analysis warnings can be safely ignored.

The regex pattern correctly handles control character removal. The static analysis warnings about control characters in the regex are false positives since this pattern is specifically designed to match and remove control characters in XML sanitization.

🧰 Tools
🪛 Biome (1.9.4)

[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)


[error] 19-19: Unexpected control character in a regular expression.

Control characters are unusual and potentially incorrect inputs, so they are disallowed.

(lint/suspicious/noControlCharactersInRegex)

@kkatusic kkatusic merged commit cf7e954 into develop Jan 6, 2025
3 checks passed
@kkatusic kkatusic deleted the fix/project_sitemap branch January 6, 2025 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: QA
Development

Successfully merging this pull request may close these issues.

2 participants