-
Notifications
You must be signed in to change notification settings - Fork 14
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(internet-header): Incomplete multi-character sanitization Code Scanning alert on hours field of internet-header footer #2807
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@swisspost/internet-header': patch | ||
--- | ||
|
||
Sanitized hours fields in footer against XSS "Incomplete multi-character sanitization" issue. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
import { h } from '@stencil/core'; | ||
import { BlockEntity } from '../../../models/footer.model'; | ||
|
||
const getContentHours = (hours: string) => hours.replace(/<[^>]*>?/gm, ''); | ||
|
||
function stripHtml(html: string): string { | ||
const doc = new DOMParser().parseFromString(html, 'text/html'); | ||
return doc.body.textContent || ''; | ||
} | ||
const callUnblu = () => { | ||
if (typeof window['unbluLSLoad'] === 'function') { | ||
window['unbluLSLoad'](); | ||
|
@@ -14,13 +16,9 @@ const callUnblu = () => { | |
}; | ||
|
||
const LiveSupport = (props: { hours: string }) => ( | ||
<button | ||
class="hours btn btn-link" | ||
id="liveSupport" | ||
type="button" | ||
onClick={callUnblu} | ||
innerHTML={getContentHours(props.hours)} | ||
></button> | ||
<button class="hours btn btn-link" id="liveSupport" type="button" onClick={callUnblu}> | ||
{stripHtml(props.hours)} | ||
</button> | ||
); | ||
|
||
export const PostFooterBlockContact = (props: { | ||
|
@@ -44,8 +42,8 @@ export const PostFooterBlockContact = (props: { | |
{content.text ? <p class="text">{content.text}</p> : null} | ||
{content.hours && isLiveSupport && <LiveSupport hours={content.hours} />} | ||
{content.hours && !isLiveSupport && ( | ||
// Some values arrive in the form of <p>8&emdash;12</p> and without replace and innerHTML, tags get rendered as text (project="klp" language="en" environment="int02") | ||
<p class="hours" innerHTML={getContentHours(content.hours)}></p> | ||
// Some values arrive in the form of <p>8—12</p> and without replace and innerHTML, tags get rendered as text (project="klp" language="en" environment="int02") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. &emdash; is not decoded with any library. It seems to never have existed (at least officially), see: https://bugzilla.mozilla.org/show_bug.cgi?id=221606 |
||
<p class="hours">{stripHtml(content.hours)}</p> | ||
)} | ||
{content.describe ? <p class="describe">{content.describe}</p> : null} | ||
</div> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DOMParser().parseFromString is not executing any script. It can still contain malicious code like onclick event that will work if it's not santitize inside the DOMParser and that the result is injected bad in the current DOM document. In our case, it's safe because using "textContent" will always allow only text. Also, this technic is used by DOMPurify library.
More infos: