summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKagami Sascha Rosylight <saschanaz@outlook.com>2023-03-19 12:27:17 +0100
committerGitHub <noreply@github.com>2023-03-19 20:27:17 +0900
commite542a030e4fc43e9842d0a006bdcf206441f62be (patch)
tree95f50430194964e0ced6e384c3689a65fd092b15
parenttest(backend): Add tests for clips (#10358) (diff)
downloadsharkey-e542a030e4fc43e9842d0a006bdcf206441f62be.tar.gz
sharkey-e542a030e4fc43e9842d0a006bdcf206441f62be.tar.bz2
sharkey-e542a030e4fc43e9842d0a006bdcf206441f62be.zip
fix(backend/URLPreviewService): エラーでHTTP 422を出すように (#10339)
* fix(backend/URLPreviewService): エラーでHTTP 402を出すように * fix import
-rw-r--r--packages/backend/src/server/web/UrlPreviewService.ts18
-rw-r--r--packages/backend/test/e2e/endpoints.ts8
2 files changed, 20 insertions, 6 deletions
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 21cf414087..b3e193cd34 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -1,7 +1,6 @@
import { Inject, Injectable } from '@nestjs/common';
import { summaly } from 'summaly';
import { DI } from '@/di-symbols.js';
-import type { UsersRepository } from '@/models/index.js';
import type { Config } from '@/config.js';
import { MetaService } from '@/core/MetaService.js';
import { HttpRequestService } from '@/core/HttpRequestService.js';
@@ -9,6 +8,7 @@ import type Logger from '@/logger.js';
import { query } from '@/misc/prelude/url.js';
import { LoggerService } from '@/core/LoggerService.js';
import { bindThis } from '@/decorators.js';
+import { ApiError } from '@/server/api/error.js';
import type { FastifyRequest, FastifyReply } from 'fastify';
@Injectable()
@@ -40,9 +40,9 @@ export class UrlPreviewService {
@bindThis
public async handle(
- request: FastifyRequest<{ Querystring: { url: string; lang: string; } }>,
+ request: FastifyRequest<{ Querystring: { url: string; lang?: string; } }>,
reply: FastifyReply,
- ) {
+ ): Promise<object | undefined> {
const url = request.query.url;
if (typeof url !== 'string') {
reply.code(400);
@@ -78,7 +78,7 @@ export class UrlPreviewService {
this.logger.succ(`Got preview of ${url}: ${summary.title}`);
- if (summary.url && !(summary.url.startsWith('http://') || summary.url.startsWith('https://'))) {
+ if (!(summary.url.startsWith('http://') || summary.url.startsWith('https://'))) {
throw new Error('unsupported schema included');
}
@@ -95,9 +95,15 @@ export class UrlPreviewService {
return summary;
} catch (err) {
this.logger.warn(`Failed to get preview of ${url}: ${err}`);
- reply.code(200);
+ reply.code(422);
reply.header('Cache-Control', 'max-age=86400, immutable');
- return {};
+ return {
+ error: new ApiError({
+ message: 'Failed to get preview',
+ code: 'URL_PREVIEW_FAILED',
+ id: '09d01cb5-53b9-4856-82e5-38a50c290a3b',
+ }),
+ };
}
}
}
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index cbe7b894f4..0a45a320f9 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -841,4 +841,12 @@ describe('Endpoints', () => {
assert.strictEqual(res.body[0].id, carolPost.id);
});
});
+
+ describe('URL preview', () => {
+ test('Error from summaly becomes HTTP 422', async () => {
+ const res = await simpleGet('/url?url=https://e:xample.com');
+ assert.strictEqual(res.status, 422);
+ assert.strictEqual(res.body.error.code, 'URL_PREVIEW_FAILED');
+ });
+ });
});