Repository navigation
fix: sanitize markup to prevent XSS #2603
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a91785d
fix: do not use dangerouslySetInnerHtml for layer description
mburri 524a057
fix: remove setDangerouslyInnerHtml completely
mburri bb54735
fix: sanitize markup content with custom SanitizedHtml component
hupf fbedbae
fix: increase timeouts to avoid failing E2E search tests
hupf 54d37dc
fix: update search test's HAR files
hupf 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,78 @@ | ||
| import { cleanup, render, screen } from "@testing-library/react"; | ||
| import { afterEach, describe, expect, it } from "vitest"; | ||
|
|
||
| import { CustomLayerDescription } from "@/charts/map/map-custom-layers-legend"; | ||
| import { parseWMSContent } from "@/charts/map/wms-utils"; | ||
|
|
||
| afterEach(cleanup); | ||
|
|
||
| // Reproduces an attacker-controlled GetCapabilities document whose <Abstract> | ||
| // carries an XSS payload next to legitimate formatting. | ||
| const CAPABILITIES = `<?xml version="1.0" encoding="UTF-8"?> | ||
| <WMS_Capabilities version="1.3.0"> | ||
| <Service><Title>probe</Title></Service> | ||
| <Capability> | ||
| <Request> | ||
| <GetMap> | ||
| <DCPType><HTTP><Get> | ||
| <OnlineResource xlink:href="https://attacker.example/wms?"/> | ||
| </Get></HTTP></DCPType> | ||
| </GetMap> | ||
| </Request> | ||
| <Layer> | ||
| <Title>root</Title> | ||
| <Layer queryable="1"> | ||
| <Name>x-probe-layer</Name> | ||
| <Title>Probe</Title> | ||
| <Abstract><![CDATA[<img src="x" onerror="alert(document.domain)"> Provided by <b>Swisstopo</b>, see <a href="https://example.com/info">details</a>.]]></Abstract> | ||
| <CRS>EPSG:3857</CRS> | ||
| </Layer> | ||
| </Layer> | ||
| </Capability> | ||
| </WMS_Capabilities>`; | ||
|
|
||
| describe("CustomLayerDescription", () => { | ||
| it("strips dangerous markup from WMS layer descriptions", () => { | ||
| const { container } = render( | ||
| <CustomLayerDescription description='<img src="x" onerror="alert(document.domain)">' /> | ||
| ); | ||
|
|
||
| expect(container.querySelector("img")).toBeNull(); | ||
| expect(container.innerHTML).not.toContain("onerror"); | ||
| }); | ||
|
|
||
| it("keeps the formatting of WMS layer descriptions", () => { | ||
| const { container } = render( | ||
| <CustomLayerDescription description='<p>Data by <b>Swisstopo</b>, see <a href="https://example.com/info">details</a>.</p>' /> | ||
| ); | ||
|
|
||
| expect(container.querySelector("b")?.textContent).toBe("Swisstopo"); | ||
|
|
||
| const link = screen.getByRole("link", { name: "details" }); | ||
| expect(link.getAttribute("href")).toBe("https://example.com/info"); | ||
| expect(link.getAttribute("rel")).toBe("noopener noreferrer"); | ||
| }); | ||
|
|
||
| it("renders a hostile WMS abstract without executing it", () => { | ||
| const layers = parseWMSContent( | ||
| CAPABILITIES, | ||
| "https://attacker.example/wms" | ||
| ); | ||
| const description = layers.find( | ||
| (d) => d.id === "x-probe-layer" | ||
| )?.description; | ||
|
|
||
| expect(description).toContain("onerror"); | ||
|
|
||
| const { container } = render( | ||
| <CustomLayerDescription description={description ?? ""} /> | ||
| ); | ||
|
|
||
| expect(container.querySelector("img")).toBeNull(); | ||
| expect(container.innerHTML).not.toContain("onerror"); | ||
| expect(container.querySelector("b")?.textContent).toBe("Swisstopo"); | ||
| expect( | ||
| screen.getByRole("link", { name: "details" }).getAttribute("href") | ||
| ).toBe("https://example.com/info"); | ||
| }); | ||
| }); |
This file contains hidden or 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 hidden or 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,45 @@ | ||
| import { cleanup, render, screen } from "@testing-library/react"; | ||
| import { afterEach, describe, expect, it } from "vitest"; | ||
|
|
||
| import { DatasetPublisher } from "@/components/dataset-metadata"; | ||
|
|
||
| afterEach(cleanup); | ||
|
|
||
| describe("DatasetPublisher", () => { | ||
| it("renders publisher anchor markup as a safe link", () => { | ||
| render( | ||
| <DatasetPublisher | ||
| publisher={ | ||
| '<a href="https://example.com/?a=1&b=2">FOEN & BAFU</a>' | ||
| } | ||
| /> | ||
| ); | ||
|
|
||
| const link = screen.getByRole("link", { name: "FOEN & BAFU" }); | ||
| expect(link.getAttribute("href")).toBe("https://example.com/?a=1&b=2"); | ||
| expect(link.getAttribute("target")).toBe("_blank"); | ||
| expect(link.getAttribute("rel")).toBe("noopener noreferrer"); | ||
| }); | ||
|
|
||
| it("does not render unsafe publisher URLs as links", () => { | ||
| const { container } = render( | ||
| <DatasetPublisher | ||
| publisher={'<a href="javascript:alert(1)">Publisher</a>'} | ||
| /> | ||
| ); | ||
|
|
||
| expect(screen.getByText("Publisher")).toBeTruthy(); | ||
| expect(container.querySelector("a")).toBeNull(); | ||
| }); | ||
|
|
||
| it("renders plain text and strips unexpected markup", () => { | ||
| const { container } = render( | ||
| <DatasetPublisher | ||
| publisher={'Publisher <img src="x" onerror="alert(1)"> & Office'} | ||
| /> | ||
| ); | ||
|
|
||
| expect(container.textContent).toBe("Publisher & Office"); | ||
| expect(container.querySelector("img")).toBeNull(); | ||
| }); | ||
| }); |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
@mburri That fixes the XSS issue, but it also breaks every formatting markup. Shouldn't we sanitize the description instead, like we did in other places? Or was there a decision, that no formatting is allowed here?
If formatting should still work, I'd introduce a sanitizing component, maybe leveraging the already present
sanitizeSchema/rehypeSanitize? Otherwise DOMPurify would be the goto IMO.Also, I assume there is another XSS in app/rdf/query-search.ts with the
highlightedTitleandhighlightedDescription.