Merge 69e662cd07 into f123be38b9

Merge branch 'develop' into develop
Update CHANGELOG.md
2025-01-25 03:10:57 +09:00 · 2024-12-19 16:13:46 +09:00 · 2024-11-23 17:10:25 +09:00 · 2024-11-22 20:18:51 +09:00 · 2024-11-22 20:15:53 +09:00 · 2024-11-21 23:02:36 +09:00
3 changed files with 5 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -15,6 +15,7 @@
 - Fix: 絵文字管理画面で一部の絵文字が表示されない問題を修正

 ### Server
+- Fix: URLをデコードしてからリクエストを送信するように
 - Fix: ユーザーのプロフィール画面をアドレス入力などで直接表示した際に概要タブの描画に失敗する問題の修正( #15032 )
 - Fix: 起動前の疎通チェックが機能しなくなっていた問題を修正  
  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/737)
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@ -283,6 +283,7 @@ export class HttpRequestService {
 		},
 	): Promise<Response> {
 		const timeout = args.timeout ?? 5000;
+		const decodedUrl = decodeURIComponent(url);

 		const controller = new AbortController();
 		setTimeout(() => {
@ -291,7 +292,7 @@ export class HttpRequestService {

 		const isLocalAddressAllowed = args.isLocalAddressAllowed ?? false;

-		const res = await fetch(url, {
+		const res = await fetch(decodedUrl, {
 			method: args.method ?? 'GET',
 			headers: {
 				'User-Agent': this.config.userAgent,
@ -299,7 +300,7 @@ export class HttpRequestService {
 			},
 			body: args.body,
 			size: args.size ?? 10 * 1024 * 1024,
-			agent: (url) => this.getAgentByUrl(url, false, isLocalAddressAllowed),
+			agent: (decodedUrl) => this.getAgentByUrl(decodedUrl, false, isLocalAddressAllowed),
 			signal: controller.signal,
 		});

--- a/packages/backend/src/server/api/endpoints/fetch-rss.ts
+++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts
@ -7,6 +7,7 @@ import Parser from 'rss-parser';
 import { Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { HttpRequestService } from '@/core/HttpRequestService.js';
+import { URL } from 'url';

 const rssParser = new Parser();
Author	SHA1	Message	Date
甘瀬ここあ	5d932a3499	Merge `69e662cd07` into `f123be38b9`	2024-12-19 16:13:46 +09:00
甘瀬ここあ	69e662cd07	Merge branch 'develop' into develop	2024-11-23 17:10:25 +09:00
AmaseCocoa	a0868b4b6c	Update CHANGELOG.md	2024-11-22 20:18:51 +09:00
AmaseCocoa	600d87db59	Merge remote-tracking branch 'upstream/develop' into develop Merge branch 'misskey-dev:develop' into develop	2024-11-22 20:15:53 +09:00
AmaseCocoa	3a2922db6f	fix(backend): HttpRequestService.tsの変更漏れを修正 (fetch時にデコード済みのurlを参照するように)	2024-11-21 23:02:36 +09:00
AmaseCocoa	545b1c043f	Merge branch 'develop' of https://github.com/AmaseCocoa/misskey into develop	2024-11-21 22:54:36 +09:00
AmaseCocoa	e9ee83fccd	fix(backend): HttpRequestService.sendでURLをデコードしてからリクエストを送信するように HttpRequestService側で処理するように変更しました。意図していたものとは異なる可能性もありますが...	2024-11-21 22:54:31 +09:00
甘瀬ここあ	cd642cc791	Merge branch 'misskey-dev:develop' into develop	2024-11-21 22:53:09 +09:00
甘瀬ここあ	c488ba03b7	Merge branch 'misskey-dev:develop' into develop	2024-11-21 15:51:00 +09:00
甘瀬ここあ	edc8d70db0	fix(backend): URLをデコードしてからリクエストを送信するように	2024-11-21 15:45:31 +09:00