Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix contest/homework edit

Browse Source
This commit is contained in:
undefined committed 2021-05-29 12:54:18 +08:00
1 parent 800b332c8b
commit d0116ac43a
3 files changed
+10 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.28.5", "version": "2.28.6",
"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",
packages/hydrooj/src/handler/contest.ts
+4 -3
View File
@@ -4,7 +4,7 @@ import AdmZip from 'adm-zip';
import { Time } from '@hydrooj/utils/lib/utils'; import { Time } from '@hydrooj/utils/lib/utils';
import { import {
ContestNotLiveError, ValidationError, ProblemNotFoundError, ContestNotLiveError, ValidationError, ProblemNotFoundError,
ContestNotAttendedError, PermissionError, BadRequestError, ContestNotAttendedError, PermissionError, BadRequestError, ContestNotFoundError,
} from '../error'; } from '../error';
import { ProblemDoc, Tdoc, User } from '../interface'; import { ProblemDoc, Tdoc, User } from '../interface';
import paginate from '../lib/paginate'; import paginate from '../lib/paginate';
@@ -169,9 +169,10 @@ export class ContestEditHandler extends Handler {
async prepare(domainId: string, tid: ObjectID) { async prepare(domainId: string, tid: ObjectID) {
if (tid) { if (tid) {
this.tdoc = await contest.get(domainId, tid); this.tdoc = await contest.get(domainId, tid);
if (!this.tdoc) throw new ContestNotFoundError(domainId, tid);
if (!this.user.own(this.tdoc)) this.checkPerm(PERM.PERM_EDIT_CONTEST); if (!this.user.own(this.tdoc)) this.checkPerm(PERM.PERM_EDIT_CONTEST);
else this.checkPerm(PERM.PERM_EDIT_CONTEST_SELF); else this.checkPerm(PERM.PERM_EDIT_CONTEST_SELF);
} } else this.checkPerm(PERM.PERM_CREATE_CONTEST);
} }
@param('tid', Types.ObjectID, true) @param('tid', Types.ObjectID, true)
@@ -394,7 +395,7 @@ export class ContestCodeHandler extends Handler {
} }
export async function apply() { export async function apply() {
Route('contest_create', '/contest/create', ContestEditHandler, PERM.PERM_CREATE_CONTEST); Route('contest_create', '/contest/create', ContestEditHandler);
Route('contest_main', '/contest', ContestListHandler, PERM.PERM_VIEW_CONTEST); Route('contest_main', '/contest', ContestListHandler, PERM.PERM_VIEW_CONTEST);
Route('contest_detail', '/contest/:tid', ContestDetailHandler, PERM.PERM_VIEW_CONTEST); Route('contest_detail', '/contest/:tid', ContestDetailHandler, PERM.PERM_VIEW_CONTEST);
Route('contest_boardcast', '/contest/:tid/boardcast', ContestBoardcastHandler); Route('contest_boardcast', '/contest/:tid/boardcast', ContestBoardcastHandler);
packages/hydrooj/src/handler/homework.ts
+5 -3
View File
@@ -5,7 +5,7 @@ import AdmZip from 'adm-zip';
import { Time } from '@hydrooj/utils/lib/utils'; import { Time } from '@hydrooj/utils/lib/utils';
import { import {
ValidationError, HomeworkNotLiveError, ProblemNotFoundError, ValidationError, HomeworkNotLiveError, ProblemNotFoundError,
HomeworkNotAttendedError, BadRequestError, HomeworkNotAttendedError, BadRequestError, ContestNotFoundError,
} from '../error'; } from '../error';
import { import {
PenaltyRules, Tdoc, ProblemDoc, User, PenaltyRules, Tdoc, ProblemDoc, User,
@@ -250,7 +250,9 @@ class HomeworkEditHandler extends Handler {
const tdoc = tid const tdoc = tid
? await contest.get(domainId, tid, document.TYPE_HOMEWORK) ? await contest.get(domainId, tid, document.TYPE_HOMEWORK)
: null; : null;
if (!this.user.own(tdoc)) this.checkPerm(PERM.PERM_EDIT_HOMEWORK); if (tid && !tdoc) throw new ContestNotFoundError(domainId, tid);
else if (!tid) this.checkPerm(PERM.PERM_CREATE_HOMEWORK);
else if (!this.user.own(tdoc)) this.checkPerm(PERM.PERM_EDIT_HOMEWORK);
else this.checkPerm(PERM.PERM_EDIT_HOMEWORK_SELF); else this.checkPerm(PERM.PERM_EDIT_HOMEWORK_SELF);
const extensionDays = tid const extensionDays = tid
? Math.round( ? Math.round(
@@ -402,7 +404,7 @@ class HomeworkCodeHandler extends Handler {
export async function apply() { export async function apply() {
Route('homework_main', '/homework', HomeworkMainHandler, PERM.PERM_VIEW_HOMEWORK); Route('homework_main', '/homework', HomeworkMainHandler, PERM.PERM_VIEW_HOMEWORK);
Route('homework_create', '/homework/create', HomeworkEditHandler, PERM.PERM_CREATE_HOMEWORK); Route('homework_create', '/homework/create', HomeworkEditHandler);
Route('homework_detail', '/homework/:tid', HomeworkDetailHandler, PERM.PERM_VIEW_HOMEWORK); Route('homework_detail', '/homework/:tid', HomeworkDetailHandler, PERM.PERM_VIEW_HOMEWORK);
Route('homework_scoreboard', '/homework/:tid/scoreboard', HomeworkScoreboardHandler, PERM.PERM_VIEW_HOMEWORK_SCOREBOARD); Route('homework_scoreboard', '/homework/:tid/scoreboard', HomeworkScoreboardHandler, PERM.PERM_VIEW_HOMEWORK_SCOREBOARD);
Route( Route(