fix(backend): HttpRequestService.tsの変更漏れを修正 (fetch時にデコード済みのurlを参照するように)

Merge branch 'develop' of https://github.com/AmaseCocoa/misskey into develop
fix(backend): HttpRequestService.sendでURLをデコードしてからリクエストを送信するように
2024-11-21 23:02:36 +09:00 · 2024-11-21 22:54:36 +09:00 · 2024-11-21 22:54:31 +09:00 · 2024-11-21 22:53:09 +09:00 · 2024-11-21 08:21:54 +00:00 · 2024-11-21 17:16:06 +09:00
5 changed files with 7 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,9 +8,9 @@
 ### General
 - Feat: コンテンツの表示にログインを必須にできるように
 - Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )
 - Enhance: 依存関係の更新
 - Enhance: l10nの更新
+- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )

 ### Client
 - Enhance: Bull DashboardでRelationship Queueの状態も確認できるように  
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-alpha.3",
+	"version": "2024.11.0-beta.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
--- 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
@ -220,7 +220,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private httpRequestService: HttpRequestService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const res = await this.httpRequestService.send(decodeURIComponent(ps.url), {
+			const res = await this.httpRequestService.send(ps.url, {
 				method: 'GET',
 				headers: {
 					Accept: 'application/rss+xml, */*',
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0-alpha.3",
+	"version": "2024.11.0-beta.4",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
Author	SHA1	Message	Date
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
github-actions[bot]	752606fe88	Bump version to 2024.11.0-beta.4	2024-11-21 08:21:54 +00:00
かっこかり	7f0ae038d4	Update CHANGELOG.md	2024-11-21 17:16:06 +09:00