mirror of
https://gitcode.com/gh_mirrors/hy/Hydro.git
synced 2026-10-20 01:38:19 +08:00
core: allow user file upload
This commit is contained in:
1 parent
b13b8835ec
commit
7bdf580e7d
13 files changed
+333
-11
No files matched your search
@@ -269,6 +269,7 @@ Domain: 域
|
||||
Don't have an account?: 还没有账户?
|
||||
Done: 已结束
|
||||
Download Dataset: 下载数据集
|
||||
Download link copied to clipboard!: 下载链接已复制到剪贴板。
|
||||
Download: 下载
|
||||
Downvote: 差评
|
||||
Duration (hours): 持续时间 (小时)
|
||||
@@ -350,6 +351,7 @@ home_account: 账户设置
|
||||
home_domain_account: 当前域的设置
|
||||
home_domain_create: 创建域
|
||||
home_domain: 我的域
|
||||
home_files: 我的文件
|
||||
home_messages: 站内消息
|
||||
home_preference: 偏好设置
|
||||
home_security: 安全设置
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "hydrooj",
|
||||
"version": "2.28.56",
|
||||
"version": "2.28.57",
|
||||
"bin": "bin/hydrooj.js",
|
||||
"main": "dist/loader.js",
|
||||
"typings": "dist/loader.d.ts",
|
||||
|
||||
@@ -1,10 +1,14 @@
|
||||
/* eslint-disable camelcase */
|
||||
import { BadRequestError } from '../error';
|
||||
import { pick } from 'lodash';
|
||||
import { BadRequestError, ForbiddenError, ValidationError } from '../error';
|
||||
import { PRIV } from '../model/builtin';
|
||||
import storage from '../model/storage';
|
||||
import * as system from '../model/system';
|
||||
import user from '../model/user';
|
||||
import {
|
||||
Route, Handler, Types, param,
|
||||
Route, Handler, Types, param, post,
|
||||
} from '../service/server';
|
||||
import { sortFiles } from '../utils';
|
||||
|
||||
class CheckInHandler extends Handler {
|
||||
async prepare() {
|
||||
@@ -46,9 +50,71 @@ class SwitchLanguageHandler extends Handler {
|
||||
}
|
||||
}
|
||||
|
||||
export class FilesHandler extends Handler {
|
||||
@param('pjax', Types.Boolean)
|
||||
async get(domainId: string, pjax = false) {
|
||||
const files = sortFiles(this.user._files);
|
||||
if (pjax) {
|
||||
this.response.body = {
|
||||
fragments: (await Promise.all([
|
||||
this.renderHTML('partials/home_files.html', { files }),
|
||||
])).map((i) => ({ html: i })),
|
||||
};
|
||||
this.response.template = '';
|
||||
} else {
|
||||
this.response.template = 'home_files.html';
|
||||
this.response.body = { files };
|
||||
}
|
||||
}
|
||||
|
||||
@post('filename', Types.Name, true)
|
||||
async postUploadFile(domainId: string, filename: string) {
|
||||
if ((this.user._files?.length || 0) >= system.get('limit.user_files')) {
|
||||
throw new ForbiddenError('File limit exceeded.');
|
||||
}
|
||||
if (!this.request.files.file) throw new ValidationError('file');
|
||||
const size = Math.sum((this.user._files || []).map((i) => i.size));
|
||||
if (size >= system.get('limit.user_files_size')) {
|
||||
throw new ForbiddenError('File size limit exceeded.');
|
||||
}
|
||||
if (!filename) filename = this.request.files.file.name || String.random(16);
|
||||
if (filename.includes('/') || filename.includes('..')) throw new ValidationError('filename', 'Bad filename');
|
||||
if (this.user._files.filter((i) => i.name === filename).length) throw new BadRequestError('file exists');
|
||||
await storage.put(`user/${this.user._id}/${filename}`, this.request.files.file.path);
|
||||
const meta = await storage.getMeta(`user/${this.user._id}/${filename}`);
|
||||
const payload = { name: filename, ...pick(meta, ['size', 'lastModified', 'etag']) };
|
||||
if (!meta) throw new Error('Upload failed');
|
||||
this.user._files.push({ _id: filename, ...payload });
|
||||
await user.setById(this.user._id, { _files: this.user._files });
|
||||
this.back();
|
||||
}
|
||||
|
||||
@post('files', Types.Array)
|
||||
async postDeleteFiles(domainId: string, files: string[]) {
|
||||
await Promise.all([
|
||||
storage.del(files.map((t) => `user/${this.user._id}/${t}`)),
|
||||
user.setById(this.user._id, { _files: this.user._files.filter((i) => !files.includes(i.name)) }),
|
||||
]);
|
||||
this.back();
|
||||
}
|
||||
}
|
||||
|
||||
export class FSDownloadHandler extends Handler {
|
||||
@param('uid', Types.Int)
|
||||
@param('filename', Types.Name)
|
||||
@param('noDisposition', Types.Boolean)
|
||||
async get(domainId: string, uid: number, filename: string, noDisposition = false) {
|
||||
this.response.redirect = await storage.signDownloadLink(
|
||||
`user/${uid}/${filename}`, noDisposition ? undefined : filename, false, 'user',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export async function apply() {
|
||||
Route('check_in', '/checkin', CheckInHandler, PRIV.PRIV_USER_PROFILE);
|
||||
Route('switch_language', '/language/:lang', SwitchLanguageHandler);
|
||||
Route('home_file', '/file', FilesHandler, PRIV.PRIV_CREATE_FILE);
|
||||
Route('fs_download', '/file/:uid/:filename', FSDownloadHandler);
|
||||
}
|
||||
|
||||
global.Hydro.handler.misc = apply;
|
||||
@@ -242,6 +242,9 @@ export const PRIV = {
|
||||
PRIV_UNLIMITED_ACCESS: 1 << 22,
|
||||
PRIV_VIEW_SYSTEM_NOTIFICATION: 1 << 23,
|
||||
PRIV_SEND_MESSAGE: 1 << 24,
|
||||
PRIV_CREATE_FILE: 1 << 16,
|
||||
PRIV_UNLIMITED_QUOTA: 1 << 17,
|
||||
PRIV_DELETE_FILE: 1 << 18,
|
||||
|
||||
PRIV_ALL: -1,
|
||||
PRIV_DEFAULT: 0,
|
||||
@@ -252,12 +255,6 @@ export const PRIV = {
|
||||
/** @deprecated */
|
||||
PRIV_READ_PRETEST_DATA_SELF: 1 << 6,
|
||||
/** @deprecated */
|
||||
PRIV_CREATE_FILE: 1 << 16,
|
||||
/** @deprecated */
|
||||
PRIV_UNLIMITED_QUOTA: 1 << 17,
|
||||
/** @deprecated */
|
||||
PRIV_DELETE_FILE: 1 << 18,
|
||||
/** @deprecated */
|
||||
PRIV_DELETE_FILE_SELF: 1 << 19,
|
||||
};
|
||||
|
||||
|
||||
@@ -184,6 +184,8 @@ SystemSetting(
|
||||
Setting('setting_server', 'server.login', true, 'boolean', 'server.login', 'Allow builtin-login', FLAG_PRO),
|
||||
Setting('setting_limits', 'limit.problem_files_max', 100, 'number', 'limit.problem_files_max', 'Max files per problem'),
|
||||
Setting('setting_limits', 'limit.problem_files_size_max', 128 * 1024 * 1024, 'number', 'limit.problem_files_size_max', 'Max files size per problem'),
|
||||
Setting('setting_limits', 'limit.user_files', 100, 'number', 'limit.user_files', 'Max files for user'),
|
||||
Setting('setting_limits', 'limit.user_files_size', 128 * 1024 * 1024, 'number', 'limit.user_files_size', 'Max total file size for user'),
|
||||
Setting('setting_basic', 'default.priv', builtin.PRIV.PRIV_DEFAULT, 'number', 'default.priv', 'Default Privilege', FLAG_PRO),
|
||||
Setting('setting_basic', 'problem.categories', builtin.CATEGORIES, 'yaml', 'problem.categories', 'Problem Categories'),
|
||||
Setting('setting_basic', 'pagination.problem', 100, 'number', 'pagination.problem', 'Problems per page'),
|
||||
|
||||
@@ -8,7 +8,9 @@ import domain from './domain';
|
||||
import { PERM, PRIV } from './builtin';
|
||||
import { ArgMethod } from '../utils';
|
||||
import { UserNotFoundError, UserAlreadyExistError, LoginError } from '../error';
|
||||
import { User as _User, Udoc, Udict } from '../interface';
|
||||
import {
|
||||
User as _User, Udoc, Udict, FileInfo,
|
||||
} from '../interface';
|
||||
import { Value } from '../typeutils';
|
||||
import { Logger } from '../logger';
|
||||
import pwhash from '../lib/hash.hydro';
|
||||
@@ -51,6 +53,7 @@ class User implements _User {
|
||||
perm: bigint;
|
||||
role: string;
|
||||
scope: bigint;
|
||||
_files: FileInfo[];
|
||||
[key: string]: any;
|
||||
|
||||
constructor(udoc: Udoc, dudoc, scope = PERM.PERM_ALL) {
|
||||
@@ -62,6 +65,7 @@ class User implements _User {
|
||||
this._hash = udoc.hash;
|
||||
this._regip = udoc.regip;
|
||||
this._loginip = udoc.loginip;
|
||||
this._files = udoc._files || [];
|
||||
|
||||
this.mail = udoc.mail;
|
||||
this.uname = udoc.uname;
|
||||
|
||||
Reference in new issue
Block a user