core: 支持直链下载测试数据

This commit is contained in:
undefined committed 2021-03-20 21:59:11 +08:00
1 parent b15cadf5fb
commit 8e0f7a2292
2 files changed
+6 -4

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.20.24", "version": "2.20.25",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "dist/loader.js", "main": "dist/loader.js",
"typings": "dist/loader.d.ts", "typings": "dist/loader.d.ts",
+5 -3
View File
@@ -21,7 +21,7 @@ import { PERM, PRIV } from '../model/builtin';
import storage from '../service/storage'; import storage from '../service/storage';
import * as bus from '../service/bus'; import * as bus from '../service/bus';
import { import {
Route, Connection, Handler, ConnectionHandler, Types, param, post, route, Route, Connection, Handler, ConnectionHandler, Types, param, post, route, get,
} from '../service/server'; } from '../service/server';
export const parseCategory = (value: string) => flatten(value.split('+').map((e) => e.split(','))).map((e) => e.trim()); export const parseCategory = (value: string) => flatten(value.split('+').map((e) => e.split(','))).map((e) => e.trim());
@@ -406,11 +406,13 @@ export class ProblemFilesHandler extends ProblemDetailHandler {
} }
export class ProblemFileDownloadHandler extends ProblemDetailHandler { export class ProblemFileDownloadHandler extends ProblemDetailHandler {
@get('type', Types.Range(['additional_file', 'testdata']), true)
@param('filename', Types.String) @param('filename', Types.String)
@param('noDisposition', Types.Boolean) @param('noDisposition', Types.Boolean)
async get(domainId: string, filename: string, noDisposition = false) { async get(domainId: string, type = 'additional_file', filename: string, noDisposition = false) {
if (type === 'testdata' && this.user._id !== this.pdoc.owner) this.checkPerm(PERM.PERM_READ_PROBLEM_DATA);
this.response.redirect = await storage.signDownloadLink( this.response.redirect = await storage.signDownloadLink(
`problem/${this.pdoc.domainId}/${this.pdoc.docId}/additional_file/${filename}`, `problem/${this.pdoc.domainId}/${this.pdoc.docId}/${type}/${filename}`,
noDisposition ? undefined : filename, false, 'user', noDisposition ? undefined : filename, false, 'user',
); );
} }