Skip to content
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

Fix: <link rel="alternate">を追って照会するのはOKレスポンスが返却された場合のみに #14627

Merged
merged 6 commits into from
Sep 25, 2024
Merged

Fix: <link rel="alternate">を追って照会するのはOKレスポンスが返却された場合のみに #14627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
59adc13
Only accept HTML `<link rel="alternate">` on success
K4rakara Sep 22, 2024
c4bd6df
Use `res.ok` instead of 200-299
K4rakara Sep 22, 2024
c036036
jsdomに戻す
kakkokari-gtyih Sep 25, 2024
716bba4
Update Changelog
kakkokari-gtyih Sep 25, 2024
fa05d02
Revert "jsdomに戻す"
kakkokari-gtyih Sep 25, 2024
dc3aa90
:art:
kakkokari-gtyih Sep 25, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/commit/8a982c61c01909e7540ff1be9f019df07c3f0624)
- Fix: サーバーサイドのDOM解析完了時にリソースを開放するように
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/634)
- Fix: `<link rel="alternate">`を追って照会するのはOKレスポンスが返却された場合のみに
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/633)

## 2024.8.0

Expand Down
6 changes: 5 additions & 1 deletion packages/backend/src/core/activitypub/ApRequestService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,11 @@ export class ApRequestService {
//#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき
const contentType = res.headers.get('content-type');

if ((contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' && _followAlternate === true) {
if (
res.ok &&
(contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' &&
_followAlternate === true
) {
const html = await res.text();
const { window, happyDOM } = new Window({
settings: {
Expand Down
Loading