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: remove invalid character for XML feed; fix #537 #538

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
"plugin:prettier/recommended"
],
"rules": {
"unicorn/no-hex-escape": "off",
"no-control-regex": "off",
"import/no-unassigned-import": "off",
"unicorn/filename-case": "off",
"no-await-in-loop": "off",
Expand Down
4 changes: 2 additions & 2 deletions packages/saber-plugin-feed/lib/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const { Feed } = require('feed')
const { getFeedPath, resolveURL } = require('./utils')
const { getFeedPath, resolveURL, removeXMLInvalidChars } = require('./utils')

const ID = 'generate-feed'

Expand Down Expand Up @@ -69,7 +69,7 @@ exports.apply = (api, options = {}) => {
// Strip HTML tags in excerpt and use it as description (a.k.a. summary)
description:
page.excerpt && page.excerpt.replace(/<(?:.|\n)*?>/gm, ''),
content,
content: removeXMLInvalidChars(content),
date: page.updatedAt,
published: page.createdAt
})
Expand Down
31 changes: 31 additions & 0 deletions packages/saber-plugin-feed/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,34 @@ exports.getFeedPath = (feedPath, defaultPath) => {
exports.resolveURL = (base, pathname) => {
return new URL(pathname, base).href
}

/**
* Removes XML-invalid characters from a string.
* reference: https://www.ryadel.com/en/javascript-remove-xml-invalid-chars-characters-string-utf8-unicode-regex/
* @param {string} string - a string potentially containing XML-invalid characters, such as non-UTF8 characters, STX, EOX and so on.
* @param {boolean} removeDiscouragedChars - a string potentially containing XML-invalid characters, such as non-UTF8 characters, STX, EOX and so on.
* @return : a sanitized string without all the XML-invalid characters.
*/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can you add a reference to those RegExp?

Copy link
Author

Choose a reason for hiding this comment

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

updated

exports.removeXMLInvalidChars = (string, removeDiscouragedChars = true) => {
// remove everything forbidden by XML 1.0 specifications, plus the unicode replacement character U+FFFD
let regex = /((?:[\0-\x08\x0B\f\x0E-\x1F\uFFFD\uFFFE\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]))/g
string = string.replace(regex, '')

if (removeDiscouragedChars) {
// remove everything not suggested by XML 1.0 specifications
regex = new RegExp(
'([\\x7F-\\x84]|[\\x86-\\x9F]|[\\uFDD0-\\uFDEF]|(?:\\uD83F[\\uDFFE\\uDFFF])|(?:\\uD87F[\\uDF' +
'FE\\uDFFF])|(?:\\uD8BF[\\uDFFE\\uDFFF])|(?:\\uD8FF[\\uDFFE\\uDFFF])|(?:\\uD93F[\\uDFFE\\uD' +
'FFF])|(?:\\uD97F[\\uDFFE\\uDFFF])|(?:\\uD9BF[\\uDFFE\\uDFFF])|(?:\\uD9FF[\\uDFFE\\uDFFF])' +
'|(?:\\uDA3F[\\uDFFE\\uDFFF])|(?:\\uDA7F[\\uDFFE\\uDFFF])|(?:\\uDABF[\\uDFFE\\uDFFF])|(?:\\' +
'uDAFF[\\uDFFE\\uDFFF])|(?:\\uDB3F[\\uDFFE\\uDFFF])|(?:\\uDB7F[\\uDFFE\\uDFFF])|(?:\\uDBBF' +
'[\\uDFFE\\uDFFF])|(?:\\uDBFF[\\uDFFE\\uDFFF])(?:[\\0-\\t\\x0B\\f\\x0E-\\u2027\\u202A-\\uD7FF\\' +
'uE000-\\uFFFF]|[\\uD800-\\uDBFF][\\uDC00-\\uDFFF]|[\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|' +
'(?:[^\\uD800-\\uDBFF]|^)[\\uDC00-\\uDFFF]))',
'g'
)
string = string.replace(regex, '')
}

return string
}