Skip to content

fix(sqllab): invalid sanitization on comparison symbol #25903

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.

Sign up for GitHub

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

Merged
justinpark merged 2 commits into from
Nov 9, 2023
Merged

fix(sqllab): invalid sanitization on comparison symbol #25903

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5185ef3
fix(sqllab): invalid sanitization on comparison symbol
justinpark Nov 8, 2023
ef232eb
replace regex by DOMParser
justinpark Nov 8, 2023
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
3 changes: 3 additions & 0 deletions superset-frontend/packages/superset-ui-core/src/utils/html.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ describe('isProbablyHTML', () => {
const plainText = 'Just a plain text';
const isHTML = isProbablyHTML(plainText);
expect(isHTML).toBe(false);

const trickyText = 'a <= 10 and b > 10';
expect(isProbablyHTML(trickyText)).toBe(false);
});
});

Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/packages/superset-ui-core/src/utils/html.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function sanitizeHtml(htmlString: string) {
}

export function isProbablyHTML(text: string) {
return /<[^>]+>/.test(text);
return /<\/?[a-z][\s\S]*>/i.test(text);
Copy link
Member

@john-bodley john-bodley Nov 8, 2023

Choose a reason for hiding this comment

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

@justinpark is there merit in using a non-regex implementation, i.e., something like this?

Copy link
Member Author

@justinpark justinpark Nov 8, 2023

Choose a reason for hiding this comment

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

that looks good.let me try with the alternative solution.

}

export function sanitizeHtmlIfNeeded(htmlString: string) {
Expand Down