Skip to content
Merged
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
15 changes: 11 additions & 4 deletions frontend/src/util/layer-construction.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,23 @@ describe("buildRelayLayer", () => {

it("lists up to three nicknames", () => {
const relays = ["a", "b", "c"].map(nickname => makeRelay({nickname}))
expect(tooltipAfterHover(relays).tooltip?.getContent()).toBe("a, b, c")
expect(tooltipAfterHover(relays).tooltip?.getContent()).toHaveProperty("textContent", "a, b, c")
})

it("summarizes more than three relays", () => {
expect(tooltipAfterHover(makeRelays(4)).tooltip?.getContent()).toBe("4 relays")
expect(tooltipAfterHover(makeRelays(4)).tooltip?.getContent()).toHaveProperty("textContent", "4 relays")
})

it("summarizes relays without nicknames", () => {
const relays = [makeRelay({nickname: ""}), makeRelay({nickname: ""})]
expect(tooltipAfterHover(relays).tooltip?.getContent()).toBe("2 relays")
expect(tooltipAfterHover(relays).tooltip?.getContent()).toHaveProperty("textContent", "2 relays")
})

it("renders relay text as text, not as markup", () => {
const relays = [makeRelay({nickname: "<img src=x onerror=alert(1)>"})]
const content = tooltipAfterHover(relays).tooltip?.getContent() as HTMLElement
expect(content.querySelector("img")).toBeNull()
expect(content.textContent).toBe("<img src=x onerror=alert(1)>")
})

it("removes the tooltip on mouseout", () => {
Expand Down Expand Up @@ -329,7 +336,7 @@ describe("buildRelayLayer sized by consensus weight", () => {
]
const layer = markers(buildRelayLayer(buildRelayCoordinatesMap(relays), false, colors, vi.fn(), true, topRelayCount))
layer[1].fire("mouseover")
return layer[0].getTooltip()?.getContent()
return (layer[0].getTooltip()?.getContent() as HTMLElement | undefined)?.textContent
}

it("is relative to the consensus weight of the shown relays", () => {
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/util/layer-construction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ function addRelayNicknameTooltip(relays: RelayLocationDto[], mostImportantRelay:
},
)
.on('mouseover', async function (this: L.Marker) {
marker.bindTooltip(tooltip, {permanent: false, direction: 'top'}).openTooltip();
// A text node instead of a HTML string, so that relay-derived text is never interpreted as markup
const content = document.createElement('div')
content.textContent = tooltip
marker.bindTooltip(content, {permanent: false, direction: 'top'}).openTooltip();
})
.on('mouseout', function (this: L.Marker) {
marker.unbindTooltip();
Expand Down
Loading