Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f8efbfe38b |
@@ -40,7 +40,6 @@ import { parseGeoUri, scaleYDimension } from '../../utils/common';
|
||||
import { formatAccuracy } from '../../utils/geoShare';
|
||||
import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
|
||||
import { FileHeader, FileDownloadButton } from './FileHeader';
|
||||
import { previewUrlsFor } from '../../utils/linkSafety';
|
||||
|
||||
// ≈ 20 lines; in rem so a larger font setting doesn't show fewer lines (Gitea #343).
|
||||
const COLLAPSE_MAX_HEIGHT_REM = 20;
|
||||
@@ -344,13 +343,7 @@ export function MText({
|
||||
if (typeof body !== 'string') return <BrokenContent />;
|
||||
const trimmedBody = trimReplyFromBody(body);
|
||||
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
|
||||
// [Gitea #286] no genuine card for a site a deceptive link only pretends to be
|
||||
const urls = urlsMatch
|
||||
? previewUrlsFor(
|
||||
[...new Set(urlsMatch)],
|
||||
typeof customBody === 'string' ? customBody : undefined,
|
||||
)
|
||||
: undefined;
|
||||
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -408,13 +401,7 @@ export function MEmote({
|
||||
if (typeof body !== 'string') return <BrokenContent />;
|
||||
const trimmedBody = trimReplyFromBody(body);
|
||||
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
|
||||
// [Gitea #286] no genuine card for a site a deceptive link only pretends to be
|
||||
const urls = urlsMatch
|
||||
? previewUrlsFor(
|
||||
[...new Set(urlsMatch)],
|
||||
typeof customBody === 'string' ? customBody : undefined,
|
||||
)
|
||||
: undefined;
|
||||
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -471,13 +458,7 @@ export function MNotice({
|
||||
if (typeof body !== 'string') return <BrokenContent />;
|
||||
const trimmedBody = trimReplyFromBody(body);
|
||||
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
|
||||
// [Gitea #286] no genuine card for a site a deceptive link only pretends to be
|
||||
const urls = urlsMatch
|
||||
? previewUrlsFor(
|
||||
[...new Set(urlsMatch)],
|
||||
typeof customBody === 'string' ? customBody : undefined,
|
||||
)
|
||||
: undefined;
|
||||
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -50,6 +50,14 @@ type FlatClip = {
|
||||
* A management toggle reveals the pack editors (personal + this room, if
|
||||
* permitted). Space-wide packs are managed from Space settings.
|
||||
*/
|
||||
/** [EC#13, EC#47] Why the fork refused to play a clip, for the user. */
|
||||
export const soundboardRefusalText = (reason: string | undefined): string => {
|
||||
if (reason === 'muted') return 'Unmute your microphone to play a soundboard clip.';
|
||||
if (reason === 'not_permitted')
|
||||
return "The soundboard isn't available in this voice channel (only microphone audio is allowed here).";
|
||||
return 'Could not play that clip.';
|
||||
};
|
||||
|
||||
export function CallSoundboard({ callEmbed }: CallSoundboardProps) {
|
||||
const mx = useMatrixClient();
|
||||
const { room } = callEmbed;
|
||||
@@ -122,13 +130,10 @@ export function CallSoundboard({ callEmbed }: CallSoundboardProps) {
|
||||
.catch(() => undefined);
|
||||
const result = await callEmbed.control.injectAudio(url, vol, clipBytes);
|
||||
if (!result.played) {
|
||||
// [EC#13] Refused fork-side (only reason today: local mic muted) —
|
||||
// [EC#13, EC#47] Refused fork-side (mic muted, or the room's token
|
||||
// only allows the microphone source, as in audio-only rooms) —
|
||||
// don't play it locally either, or the user would think it went out.
|
||||
setError(
|
||||
result.reason === 'muted'
|
||||
? 'Unmute your microphone to play a soundboard clip.'
|
||||
: 'Could not play that clip.',
|
||||
);
|
||||
setError(soundboardRefusalText(result.reason));
|
||||
done();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { analyzeLink, hostFromText, previewUrlsFor, registrableDomain } from './linkSafety';
|
||||
import { analyzeLink, hostFromText, registrableDomain } from './linkSafety';
|
||||
|
||||
test('visible text that names another site is a mismatch', () => {
|
||||
const r = analyzeLink('https://matrix.lotusguild.org/login', 'https://evil.example/login');
|
||||
@@ -73,25 +73,3 @@ test('shared hosting suffixes are separate sites (#335)', () => {
|
||||
);
|
||||
assert.equal(registrableDomain('news.bbc.co.uk'), 'bbc.co.uk');
|
||||
});
|
||||
|
||||
test('previewUrlsFor: no preview for a site a deceptive link only claims (#286)', () => {
|
||||
const urls = ['https://paypal.com'];
|
||||
assert.deepEqual(
|
||||
previewUrlsFor(urls, '<a href="https://evil.example/login">https://paypal.com</a>'),
|
||||
[],
|
||||
);
|
||||
// An honest link keeps its preview.
|
||||
assert.deepEqual(
|
||||
previewUrlsFor(urls, '<a href="https://www.paypal.com/x">https://paypal.com</a>'),
|
||||
urls,
|
||||
);
|
||||
assert.deepEqual(previewUrlsFor(urls, undefined), urls);
|
||||
// Other links in the message keep theirs.
|
||||
assert.deepEqual(
|
||||
previewUrlsFor(
|
||||
['https://paypal.com', 'https://lotusguild.org'],
|
||||
'see <a href="https://evil.example">paypal.com</a> and https://lotusguild.org',
|
||||
),
|
||||
['https://lotusguild.org'],
|
||||
);
|
||||
});
|
||||
|
||||
@@ -221,37 +221,3 @@ export const analyzeLink = (text: string, href: string): LinkSafety | null => {
|
||||
const other = shown.find((h) => registrableDomain(h) !== realSite);
|
||||
return { mismatch: other !== undefined, shownHost: other ?? shown[0], realHost, punycode };
|
||||
};
|
||||
|
||||
const ANCHOR_REG = /<a\s[^>]*href\s*=\s*(["'])(.*?)\1[^>]*>([\s\S]*?)<\/a>/gi;
|
||||
const decodeEntities = (s: string): string =>
|
||||
s
|
||||
.replace(/<[^>]+>/g, '')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, "'")
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/&/g, '&');
|
||||
|
||||
/**
|
||||
* [Gitea #286] The URLs to build link previews for. Previews come from the
|
||||
* plain `body`, but clicks follow `formatted_body`'s hrefs, and a sender
|
||||
* controls both: text reading "https://paypal.com" linked to evil.example got
|
||||
* a genuine PayPal card. Drop any body URL whose site is only *claimed* by a
|
||||
* deceptive link's text.
|
||||
*/
|
||||
export const previewUrlsFor = (urls: string[], formattedBody: string | undefined): string[] => {
|
||||
if (!formattedBody || urls.length === 0) return urls;
|
||||
const claimed = new Set<string>();
|
||||
Array.from(formattedBody.matchAll(ANCHOR_REG)).forEach((m) => {
|
||||
const safety = analyzeLink(decodeEntities(m[3]), decodeEntities(m[2]));
|
||||
if (safety?.mismatch && safety.shownHost) claimed.add(registrableDomain(safety.shownHost));
|
||||
});
|
||||
if (claimed.size === 0) return urls;
|
||||
return urls.filter((u) => {
|
||||
try {
|
||||
return !claimed.has(registrableDomain(new URL(u).hostname));
|
||||
} catch {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user