-
Notifications
You must be signed in to change notification settings - Fork 392
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
CB-4743 adds html sanitizer #2420
Merged
Wroud
merged 5 commits into
devel
from
CB-4743-remove-all-dangerously-set-inner-html-properties
Mar 5, 2024
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
00864bd
CB-4743 adds html sanitizer
16dde3e
CB-4743 adds license to sanitizeHtml
02e19ce
CB-4743 do not use sanitize to purify the json line data
7e6d937
CB-4743 fix: toSafeHtmlString test correct cases
97476ec
Merge branch 'devel' into CB-4743-remove-all-dangerously-set-inner-ht…
mr-anton-t 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
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,28 @@ | ||
/* | ||
* CloudBeaver - Cloud Database Manager | ||
* Copyright (C) 2020-2024 DBeaver Corp and others | ||
* | ||
* Licensed under the Apache License, Version 2.0. | ||
* you may not use this file except in compliance with the License. | ||
*/ | ||
import { toSafeHtmlString } from './toSafeHtmlString'; | ||
|
||
describe('toSafeHtmlString', () => { | ||
it('should make html string safe', () => { | ||
const input = '<script>alert("some unsafe action")</script>'; | ||
const output = toSafeHtmlString(input); | ||
expect(output).toBe('<script>alert("some unsafe action")</script>'); | ||
}); | ||
|
||
it('should return empty string', () => { | ||
const input = ''; | ||
const output = toSafeHtmlString(input); | ||
expect(output).toBe(''); | ||
}); | ||
|
||
it('should return the same string', () => { | ||
const input = 'some safe string'; | ||
const output = toSafeHtmlString(input); | ||
expect(output).toBe(input); | ||
}); | ||
}); |
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,14 @@ | ||
/* | ||
* CloudBeaver - Cloud Database Manager | ||
* Copyright (C) 2020-2024 DBeaver Corp and others | ||
* | ||
* Licensed under the Apache License, Version 2.0. | ||
* you may not use this file except in compliance with the License. | ||
*/ | ||
export function toSafeHtmlString(dirty: string): string { | ||
const el = document.createElement('div'); | ||
el.innerText = el.textContent = dirty; | ||
dirty = el.innerHTML; | ||
|
||
return dirty; | ||
} |
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.
Probably better to use lib like dompurify to sanitize html
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.
this was my first solution. @Wroud suggested to generate a html safe string
in this case we kill 2 rabbits: