Merge tag '10.102.626-m544' into custom/atsuchan

10.102.626-m544

locales/en-US.yml

@@ -108,6 +108,7 @@ common:
   image: "Image"
   video: "Video"
   audio: "Audio"
+  application: "Application"
   desktop-mode: 'Desktop mode'
   mobile-mode: 'Mobile mode'
   empty: 'Empty'

locales/ja-JP.yml

@@ -110,6 +110,7 @@ common:
   image: "画像"
   video: "動画"
   audio: "音声"
+  application: "アプリケーション"
   desktop-mode: 'デスクトップ版'
   mobile-mode: 'モバイル版'
   empty: 'ありません！'

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "mei23 <[email protected]>",
-	"version": "10.102.625-m544",
+	"version": "10.102.626-m544",
 	"codename": "m544",
 	"repository": {
 		"type": "git",

src/client/app/admin/views/drive.vue

@@ -64,6 +64,7 @@
 					<option value="image/*">{{ $t('@.image') }}</option>
 					<option value="video/*">{{ $t('@.video') }}</option>
 					<option value="audio/*">{{ $t('@.audio') }}</option>
+					<option value="application/*">{{ $t('@.application') }}</option>
 				</ui-select>
 			</ui-horizon-group>
 			<div class="kidvdlkg" v-for="file in files" :key="file.id">

src/misc/mime-type-filter.ts

@@ -0,0 +1,10 @@
+import escapeRegExp = require('escape-regexp');
+
+export const typeFilterValidater = /^([*]|[a-z]+)[/]([*]|[0-9A-Za-z+.-]+)$/;
+
+export function genTypeFilterRegex(pattern: string) {
+	const m = pattern.match(typeFilterValidater);
+	if (!m) throw 'Invalid pattern';
+	const cnv = (x: string) => x === '*' ? '[^/]+' : escapeRegExp(x);
+	return new RegExp(`^${cnv(m[1])}[/]${cnv(m[2])}$`);
+}

src/server/api/endpoints/admin/drive/files.ts

@@ -1,5 +1,6 @@
 import $ from 'cafy';
 import { toDbHost } from '../../../../../misc/convert-host';
+import { genTypeFilterRegex, typeFilterValidater } from '../../../../../misc/mime-type-filter';
 import File, { packMany } from '../../../../../models/drive-file';
 import { getSystem1 } from '../../../../../services/emoji-store';
 import define from '../../../define';
@@ -45,7 +46,7 @@ export const meta = {
 		},
 
 		type: {
-			validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
+			validator: $.optional.str.match(typeFilterValidater)
 		},
 	}
 };
@@ -93,7 +94,7 @@ export default define(meta, async (ps, me) => {
 	}
 
 	if (ps.type) {
-		q.contentType = new RegExp(`^${ps.type.replace(/\*/g, '.+?')}$`);
+		q.contentType = genTypeFilterRegex(ps.type);
 	}
 
 	const files = await File

src/server/api/endpoints/drive/files.ts

@@ -1,5 +1,6 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
+import { genTypeFilterRegex, typeFilterValidater } from '../../../../misc/mime-type-filter';
 import DriveFile, { packMany } from '../../../../models/drive-file';
 import define from '../../define';
 
@@ -46,7 +47,7 @@ export const meta = {
 		},
 
 		type: {
-			validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
+			validator: $.optional.str.match(typeFilterValidater)
 		}
 	},
 
@@ -102,7 +103,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	if (ps.type) {
-		query.contentType = new RegExp(`^${ps.type.replace(/\*/g, '.+?')}$`);
+		query.contentType = genTypeFilterRegex(ps.type);
 	}
 
 	const files = await DriveFile

src/server/api/endpoints/drive/stream.ts

@@ -1,5 +1,6 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
+import { genTypeFilterRegex, typeFilterValidater } from '../../../../misc/mime-type-filter';
 import DriveFile, { packMany } from '../../../../models/drive-file';
 import define from '../../define';
 
@@ -27,7 +28,7 @@ export const meta = {
 		},
 
 		type: {
-			validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
+			validator: $.optional.str.match(typeFilterValidater)
 		}
 	},
 
@@ -61,7 +62,7 @@ export default define(meta, async (ps, user) => {
 	}
 
 	if (ps.type) {
-		query.contentType = new RegExp(`^${ps.type.replace(/\*/g, '.+?')}$`);
+		query.contentType = genTypeFilterRegex(ps.type);
 	}
 
 	const files = await DriveFile

test/mime-type-filter.ts

@@ -0,0 +1,87 @@
+import * as assert from 'assert';
+import { genTypeFilterRegex, typeFilterValidater } from '../src/misc/mime-type-filter';
+
+describe('typeFilterValidater', () => {
+	it('Allow image/jpeg', () => {
+		assert.strictEqual(typeFilterValidater.test('image/jpeg'), true);
+	});
+
+	it('Allow image/*', () => {
+		assert.strictEqual(typeFilterValidater.test('image/*'), true);
+	});
+
+	it('Allow */*', () => {
+		assert.strictEqual(typeFilterValidater.test('*/*'), true);
+	});
+
+	it('Reject image/a*', () => {
+		assert.strictEqual(typeFilterValidater.test('image/a*'), false);
+	});
+
+	it('Reject image/a*b*c', () => {
+		assert.strictEqual(typeFilterValidater.test('image/a*b*c'), false);
+	});
+
+	it('Reject image*/jpeg', () => {
+		assert.strictEqual(typeFilterValidater.test('image*/jpeg'), false);
+	});
+
+	it('Reject */*/*', () => {
+		assert.strictEqual(typeFilterValidater.test('*/*/*'), false);
+	});
+
+	it('Allow video/mp4', () => {
+		assert.strictEqual(typeFilterValidater.test('video/mp4'), true);
+	});
+
+	it('Allow video/MP1S', () => {
+		assert.strictEqual(typeFilterValidater.test('video/MP1S'), true);
+	});
+
+	it('Allow image/x-icon', () => {
+		assert.strictEqual(typeFilterValidater.test('image/x-icon'), true);
+	});
+
+	it('Allow image/svg+xml', () => {
+		assert.strictEqual(typeFilterValidater.test('image/svg+xml'), true);
+	});
+
+	it('Allow audio/vnd.wave', () => {
+		assert.strictEqual(typeFilterValidater.test('audio/vnd.wave'), true);
+	});
+
+	it('Reject %', () => {
+		assert.strictEqual(typeFilterValidater.test('image/%'), false);
+	});
+
+	it('Reject _', () => {
+		assert.strictEqual(typeFilterValidater.test('image/_'), false);
+	});
+
+	it('Reject .*', () => {
+		assert.strictEqual(typeFilterValidater.test('image/.*'), false);
+	});
+
+	// 難しいのでエスケープで対応する
+	//it('Reject .+', () => {
+	//	assert.strictEqual(typeFilterValidater.test('image/.+'), false);
+	//});
+});
+
+describe('genTypeFilterRegex', () => {
+	it('image/jpeg', () => {
+		assert.strictEqual(genTypeFilterRegex('image/jpeg').source, '^image[/]jpeg$');
+	});
+
+	it('image/*', () => {
+		assert.strictEqual(genTypeFilterRegex('image/*').source, '^image[/][^/]+$');
+	});
+
+	it('*/*', () => {
+		assert.strictEqual(genTypeFilterRegex('*/*').source, '^[^/]+[/][^/]+$');
+	});
+
+	it('image/.+', () => {
+		assert.strictEqual(genTypeFilterRegex('image/.+').source, '^image[/]\\.\\+$');
+	});
+});