Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2c11bd3b8e |
@@ -54,6 +54,7 @@ import {
|
|||||||
GIF_PREVIEW_MAX_WIDTH,
|
GIF_PREVIEW_MAX_WIDTH,
|
||||||
gifPreviewBox,
|
gifPreviewBox,
|
||||||
} from '../../utils/gifPreviewSize';
|
} from '../../utils/gifPreviewSize';
|
||||||
|
import { sameProvider } from './embedProvider';
|
||||||
|
|
||||||
const linkStyles = { color: color.Success.Main };
|
const linkStyles = { color: color.Success.Main };
|
||||||
|
|
||||||
@@ -2497,7 +2498,10 @@ export const UrlPreviewCard = as<'div', { url: string; ts: number }>(
|
|||||||
const resolveEmbed = (prev: IPreviewUrlResponse): MediaEmbed | null => {
|
const resolveEmbed = (prev: IPreviewUrlResponse): MediaEmbed | null => {
|
||||||
if (embed) return embed;
|
if (embed) return embed;
|
||||||
const ogUrl = prev['og:url'];
|
const ogUrl = prev['og:url'];
|
||||||
return typeof ogUrl === 'string' && ogUrl !== url
|
// [Gitea #326] …but only from an og:url on the posted link's own
|
||||||
|
// provider: the page sets og:url, so any site could otherwise show up
|
||||||
|
// as a playable YouTube (etc.) card that links to itself.
|
||||||
|
return typeof ogUrl === 'string' && ogUrl !== url && sameProvider(url, ogUrl)
|
||||||
? parseMediaEmbed(ogUrl, window.location.hostname)
|
? parseMediaEmbed(ogUrl, window.location.hostname)
|
||||||
: null;
|
: null;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { sameProvider } from './embedProvider';
|
||||||
|
|
||||||
|
test("sameProvider: a page cannot borrow another provider's embed via og:url (#326)", () => {
|
||||||
|
const yt = 'https://www.youtube.com/watch?v=dQw4w9WgXcQ';
|
||||||
|
assert.equal(sameProvider('https://evil.example/free-gift', yt), false);
|
||||||
|
assert.equal(sameProvider('https://youtube.com.evil.example/x', yt), false);
|
||||||
|
assert.equal(sameProvider('https://youtu.be/abc', yt), true);
|
||||||
|
assert.equal(sameProvider('https://m.youtube.com/shorts/abc', yt), true);
|
||||||
|
assert.equal(
|
||||||
|
sameProvider('https://vm.tiktok.com/ZM123/', 'https://www.tiktok.com/@a/video/1'),
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
assert.equal(sameProvider('https://spotify.link/abc', 'https://open.spotify.com/track/1'), true);
|
||||||
|
assert.equal(sameProvider('https://on.soundcloud.com/x', 'https://soundcloud.com/a/b'), true);
|
||||||
|
assert.equal(
|
||||||
|
sameProvider('https://redd.it/abc', 'https://www.reddit.com/r/x/comments/abc/'),
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
assert.equal(sameProvider('not a url', yt), false);
|
||||||
|
});
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
/**
|
||||||
|
* [Gitea #326] A page's og:url is chosen by the page itself, so a phishing
|
||||||
|
* link could serve `og:url = youtube.com/watch?v=…` and render as a playable
|
||||||
|
* YouTube card linking to the attacker. Only trust an og:url on the same
|
||||||
|
* provider as the link actually posted (including the provider's own
|
||||||
|
* short-link domains).
|
||||||
|
*/
|
||||||
|
const PROVIDER_ALIASES: Record<string, string> = {
|
||||||
|
'youtu.be': 'youtube.com',
|
||||||
|
'youtube-nocookie.com': 'youtube.com',
|
||||||
|
'spotify.link': 'spotify.com',
|
||||||
|
'redd.it': 'reddit.com',
|
||||||
|
'x.com': 'twitter.com',
|
||||||
|
'twitch.tv': 'twitch.tv',
|
||||||
|
'apple.co': 'apple.com',
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pure: the provider a host belongs to (last two labels, aliases folded). Hosts
|
||||||
|
* under two-part public suffixes (`*.co.uk`) share a value, which is harmless
|
||||||
|
* here: no embeddable provider lives under one.
|
||||||
|
*/
|
||||||
|
export const providerOf = (host: string): string => {
|
||||||
|
const parts = host.toLowerCase().replace(/\.$/, '').split('.');
|
||||||
|
const base = parts.slice(-2).join('.');
|
||||||
|
return PROVIDER_ALIASES[base] ?? base;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Pure: whether `ogUrl` is on the same provider as the posted `url`. */
|
||||||
|
export function sameProvider(url: string, ogUrl: string): boolean {
|
||||||
|
try {
|
||||||
|
return providerOf(new URL(url).hostname) === providerOf(new URL(ogUrl).hostname);
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -47,12 +47,8 @@ import {
|
|||||||
recentForwardTargetsAtom,
|
recentForwardTargetsAtom,
|
||||||
addRecentForwardTarget,
|
addRecentForwardTarget,
|
||||||
} from '../../../state/recentForwardTargets';
|
} from '../../../state/recentForwardTargets';
|
||||||
import {
|
import { buildForwardContent, buildPlaintextAttachmentContent } from './forwardContent';
|
||||||
buildForwardContent,
|
import { useLocalRoomNames } from '../../../hooks/useRoomMeta';
|
||||||
buildPlaintextAttachmentContent,
|
|
||||||
forwardEncryptionWarning,
|
|
||||||
} from './forwardContent';
|
|
||||||
import { useLocalRoomNames, getLocalRoomName } from '../../../hooks/useRoomMeta';
|
|
||||||
|
|
||||||
type RoomRowProps = {
|
type RoomRowProps = {
|
||||||
room: Room;
|
room: Room;
|
||||||
@@ -279,14 +275,6 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
|
|||||||
// Selection persists across query changes: a room selected then filtered out
|
// Selection persists across query changes: a room selected then filtered out
|
||||||
// of the rendered slice stays selected.
|
// of the rendered slice stays selected.
|
||||||
const [selectedRoomIds, setSelectedRoomIds] = useState<Set<string>>(new Set());
|
const [selectedRoomIds, setSelectedRoomIds] = useState<Set<string>>(new Set());
|
||||||
const encryptionWarning = forwardEncryptionWarning(
|
|
||||||
!!mx.getRoom(mEvent.getRoomId() ?? '')?.hasEncryptionStateEvent(),
|
|
||||||
[...selectedRoomIds]
|
|
||||||
.map((id) => mx.getRoom(id))
|
|
||||||
.filter((r): r is Room => !!r && !r.hasEncryptionStateEvent())
|
|
||||||
// The name the user sees (their own "Rename for me" name, if set).
|
|
||||||
.map((r) => getLocalRoomName(mx, r.roomId) ?? r.name),
|
|
||||||
);
|
|
||||||
|
|
||||||
const toggleRoom = useCallback((roomId: string) => {
|
const toggleRoom = useCallback((roomId: string) => {
|
||||||
setSelectedRoomIds((prev) => {
|
setSelectedRoomIds((prev) => {
|
||||||
@@ -602,13 +590,7 @@ export function ForwardMessageDialog({ mEvent, onClose }: Props) {
|
|||||||
shrink="No"
|
shrink="No"
|
||||||
direction="Column"
|
direction="Column"
|
||||||
style={{ padding: `${config.space.S200} ${config.space.S400}` }}
|
style={{ padding: `${config.space.S200} ${config.space.S400}` }}
|
||||||
gap="200"
|
|
||||||
>
|
>
|
||||||
{encryptionWarning && (
|
|
||||||
<Text size="T200" role="note" style={{ color: color.Warning.Main }}>
|
|
||||||
{encryptionWarning}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
<Button
|
<Button
|
||||||
variant="Primary"
|
variant="Primary"
|
||||||
size="400"
|
size="400"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { test } from 'node:test';
|
import { test } from 'node:test';
|
||||||
import assert from 'node:assert/strict';
|
import assert from 'node:assert/strict';
|
||||||
import { MatrixClient, MatrixEvent } from 'matrix-js-sdk';
|
import { MatrixClient, MatrixEvent } from 'matrix-js-sdk';
|
||||||
import { buildForwardContent, forwardEncryptionWarning, getForwardedMeta } from './forwardContent';
|
import { buildForwardContent, getForwardedMeta } from './forwardContent';
|
||||||
|
|
||||||
// Pure content builder buildForwardContent: refuses undecryptable events, forwards
|
// Pure content builder buildForwardContent: refuses undecryptable events, forwards
|
||||||
// the latest edit (`m.new_content`), and strips reply fallbacks + `m.relates_to`.
|
// the latest edit (`m.new_content`), and strips reply fallbacks + `m.relates_to`.
|
||||||
@@ -171,16 +171,3 @@ test('getForwardedMeta rejects malformed metadata', () => {
|
|||||||
assert.equal(getForwardedMeta({ 'io.lotus.forwarded': { sender: 1 } }), undefined);
|
assert.equal(getForwardedMeta({ 'io.lotus.forwarded': { sender: 1 } }), undefined);
|
||||||
assert.equal(getForwardedMeta({}), undefined);
|
assert.equal(getForwardedMeta({}), undefined);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('forwardEncryptionWarning: only from an encrypted room into unencrypted ones (#330)', () => {
|
|
||||||
assert.equal(forwardEncryptionWarning(false, ['general']), undefined);
|
|
||||||
assert.equal(forwardEncryptionWarning(true, []), undefined);
|
|
||||||
assert.match(
|
|
||||||
forwardEncryptionWarning(true, ['general']) ?? '',
|
|
||||||
/^general isn't encrypted\..*that room, along with who originally wrote it\.$/,
|
|
||||||
);
|
|
||||||
assert.match(
|
|
||||||
forwardEncryptionWarning(true, ['a', 'b']) ?? '',
|
|
||||||
/^2 of the rooms you picked aren't encrypted\..*those rooms/,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -122,23 +122,3 @@ export async function buildPlaintextAttachmentContent(
|
|||||||
|
|
||||||
return plainContent;
|
return plainContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* [Gitea #330] The note shown when forwarding out of an encrypted room into
|
|
||||||
* rooms that aren't: the text (and a re-uploaded attachment) becomes readable
|
|
||||||
* by the server, and the original author is shown with it. Undefined when
|
|
||||||
* there's nothing to warn about.
|
|
||||||
*/
|
|
||||||
export function forwardEncryptionWarning(
|
|
||||||
sourceEncrypted: boolean,
|
|
||||||
unencryptedDestNames: string[],
|
|
||||||
): string | undefined {
|
|
||||||
if (!sourceEncrypted || unencryptedDestNames.length === 0) return undefined;
|
|
||||||
const where =
|
|
||||||
unencryptedDestNames.length === 1
|
|
||||||
? `${unencryptedDestNames[0]} isn't encrypted.`
|
|
||||||
: `${unencryptedDestNames.length} of the rooms you picked aren't encrypted.`;
|
|
||||||
return `${where} The forwarded message (and any attachment) will be readable by the server and everyone in ${
|
|
||||||
unencryptedDestNames.length === 1 ? 'that room' : 'those rooms'
|
|
||||||
}, along with who originally wrote it.`;
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user