core: limit ViewRecord

This commit is contained in:
undefined committed 2021-08-07 02:47:21 +08:00
1 parent 63894f9959
commit 77fc46c069
17 files changed
+37 -30

No files matched your search

-1
View File
@@ -546,7 +546,6 @@ Rank: 순위
ranking: 순위 ranking: 순위
Read data of own problems: 자신의 문제 데이터 읽기 Read data of own problems: 자신의 문제 데이터 읽기
Read data of problem: 문제 데이터 읽기 Read data of problem: 문제 데이터 읽기
Read record codes: 점수 읽기
Ready (☆▽☆): 준비 완료! (☆▽☆) Ready (☆▽☆): 준비 완료! (☆▽☆)
Ready: 준비됨 Ready: 준비됨
Recent {0} Records: 최근 {0} 점수 Recent {0} Records: 최근 {0} 점수
+1 -1
View File
@@ -603,7 +603,7 @@ Recalculates nSubmit and nAccept in problem status.: 重新计算每道题目的
Recommended: 推荐 Recommended: 推荐
Record {0} not found.: 记录 {0} 不存在。 Record {0} not found.: 记录 {0} 不存在。
record_detail: 记录详情 record_detail: 记录详情
record_main: 评测队列 record_main: 评测记录
Records per page: 每页展示的评测记录数量 Records per page: 每页展示的评测记录数量
Records: 评测记录 Records: 评测记录
Refresh Records: 刷新评测记录 Refresh Records: 刷新评测记录
+1 -1
View File
@@ -351,9 +351,9 @@ QQ Group: QQ 群
QQ Visibility: QQ 可見性 QQ Visibility: QQ 可見性
Quit Scratchpad: 退出線上程式設計模式 Quit Scratchpad: 退出線上程式設計模式
Rank: 排名 Rank: 排名
Read all records: 讀取記錄
Read data of own problems: 讀取自己題目的資料 Read data of own problems: 讀取自己題目的資料
Read data of problem: 讀取題目資料 Read data of problem: 讀取題目資料
Read record codes: 讀取記錄的程式碼
Ready (☆▽☆): 馬上開始 (☆▽☆) Ready (☆▽☆): 馬上開始 (☆▽☆)
Ready: 即將開始 Ready: 即將開始
Recent {0} Records: 最近 {0} 條記錄 Recent {0} Records: 最近 {0} 條記錄
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.31.2", "version": "2.32.0",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
+4 -4
View File
@@ -386,11 +386,11 @@ export class ContestDetailProblemSubmitHandler extends ContestProblemHandler {
export class ContestCodeHandler extends Handler { export class ContestCodeHandler extends Handler {
@param('tid', Types.ObjectID) @param('tid', Types.ObjectID)
async get(domainId: string, tid: ObjectID) { async get(domainId: string, tid: ObjectID) {
if (!this.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE)) { await this.limitRate('contest_code', 3600, 60);
this.checkPerm(PERM.PERM_READ_RECORD_CODE);
}
await this.limitRate('homework_code', 3600, 60);
const [tdoc, tsdocs] = await contest.getAndListStatus(domainId, tid); const [tdoc, tsdocs] = await contest.getAndListStatus(domainId, tid);
if (!this.user.own(tdoc) && !this.user.hasPriv(PRIV.PRIV_READ_RECORD)) {
this.checkPerm(PERM.PERM_READ_RECORD);
}
if (!contest.canShowRecord.call(this, tdoc as any, true)) { if (!contest.canShowRecord.call(this, tdoc as any, true)) {
throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD); throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
} }
+4 -2
View File
@@ -389,11 +389,13 @@ class HomeworkScoreboardDownloadHandler extends Handler {
class HomeworkCodeHandler extends Handler { class HomeworkCodeHandler extends Handler {
@param('tid', Types.ObjectID) @param('tid', Types.ObjectID)
async get(domainId: string, tid: ObjectID) { async get(domainId: string, tid: ObjectID) {
if (!this.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE)) this.checkPerm(PERM.PERM_READ_RECORD_CODE); await this.limitRate('contest_code', 3600, 60);
await this.limitRate('homework_code', 3600, 60);
const [tdoc, tsdocs] = await contest.getAndListStatus( const [tdoc, tsdocs] = await contest.getAndListStatus(
domainId, tid, document.TYPE_HOMEWORK, domainId, tid, document.TYPE_HOMEWORK,
); );
if (!this.user.own(tdoc) && !this.user.hasPriv(PRIV.PRIV_READ_RECORD)) {
this.checkPerm(PERM.PERM_READ_RECORD);
}
const rnames = {}; const rnames = {};
for (const tsdoc of tsdocs) { for (const tsdoc of tsdocs) {
for (const pid in tsdoc.detail || {}) { for (const pid in tsdoc.detail || {}) {
+9 -4
View File
@@ -104,8 +104,8 @@ class RecordDetailHandler extends Handler {
throw new PermissionError(rid); throw new PermissionError(rid);
} }
} }
if (rdoc.uid !== this.user._id && !this.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE)) { if (rdoc.uid !== this.user._id && !this.user.hasPriv(PRIV.PRIV_READ_RECORD)) {
if (!this.user.hasPerm(PERM.PERM_READ_RECORD_CODE)) rdoc.code = null; this.checkPerm(PERM.PERM_READ_RECORD);
} }
// eslint-disable-next-line prefer-const // eslint-disable-next-line prefer-const
let [pdoc, udoc] = await Promise.all([ let [pdoc, udoc] = await Promise.all([
@@ -188,7 +188,10 @@ class RecordMainConnectionHandler extends ConnectionHandler {
if (pretest || contest.canShowScoreboard.call(this, tdoc, true)) this.tid = tid.toHexString(); if (pretest || contest.canShowScoreboard.call(this, tdoc, true)) this.tid = tid.toHexString();
else throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD); else throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
} }
if (uidOrName) { if (pretest) {
this.pretest = true;
this.uid = this.user._id;
} else if (uidOrName) {
let udoc = await user.getById(domainId, +uidOrName); let udoc = await user.getById(domainId, +uidOrName);
if (udoc) this.uid = udoc._id; if (udoc) this.uid = udoc._id;
else { else {
@@ -207,7 +210,6 @@ class RecordMainConnectionHandler extends ConnectionHandler {
} else throw new ProblemNotFoundError(domainId, pid); } else throw new ProblemNotFoundError(domainId, pid);
} }
if (status) this.status = status; if (status) this.status = status;
if (pretest) this.pretest = true;
this.dispose = bus.on('record/change', this.onRecordChange.bind(this)); this.dispose = bus.on('record/change', this.onRecordChange.bind(this));
} }
@@ -261,6 +263,9 @@ class RecordDetailConnectionHandler extends ConnectionHandler {
const tdoc = await contest.get(domainId, rdoc.contest.tid, -1); const tdoc = await contest.get(domainId, rdoc.contest.tid, -1);
if (!contest.canShowRecord.call(this, tdoc)) throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD); if (!contest.canShowRecord.call(this, tdoc)) throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
} }
if (rdoc.uid !== this.user._id && !this.user.hasPriv(PRIV.PRIV_READ_RECORD)) {
this.checkPerm(PERM.PERM_READ_RECORD);
}
this.rid = rid.toString(); this.rid = rid.toString();
this.dispose = bus.on('record/change', this.onRecordChange.bind(this)); this.dispose = bus.on('record/change', this.onRecordChange.bind(this));
this.onRecordChange(rdoc); this.onRecordChange(rdoc);
+6 -4
View File
@@ -34,16 +34,18 @@ const buildChecker = (...permPrivChecker: Array<number | bigint | Function>) =>
}; };
export const Nav = ( export const Nav = (
name: string, args: Dictionary<any> = {}, prefix: string, name: string, args: ((handler: any) => Record<string, any>) | Record<string, any> = {}, prefix: string,
...permPrivChecker: Array<number | bigint | Function> ...permPrivChecker: Array<number | bigint | Function>
) => { ) => {
if (typeof args !== 'function') args = () => (args || {});
const checker = buildChecker(...permPrivChecker);
if (name.startsWith('@@')) { if (name.startsWith('@@')) {
global.Hydro.ui.nodes.nav.splice(+name.split('@@')[1], 0, { global.Hydro.ui.nodes.nav.splice(+name.split('@@')[1], 0, {
name: name.split('@@')[2], args: args || {}, prefix, checker: buildChecker(...permPrivChecker), name: name.split('@@')[2], args, prefix, checker,
}); });
} else { } else {
global.Hydro.ui.nodes.nav.push({ global.Hydro.ui.nodes.nav.push({
name, args: args || {}, prefix, checker: buildChecker(...permPrivChecker), name, args, prefix, checker,
}); });
} }
}; };
@@ -70,7 +72,7 @@ Nav('training_main', {}, 'training', PERM.PERM_VIEW_TRAINING);
Nav('homework_main', {}, 'homework', PERM.PERM_VIEW_HOMEWORK); Nav('homework_main', {}, 'homework', PERM.PERM_VIEW_HOMEWORK);
Nav('discussion_main', {}, 'discussion', PERM.PERM_VIEW_DISCUSSION); Nav('discussion_main', {}, 'discussion', PERM.PERM_VIEW_DISCUSSION);
Nav('contest_main', {}, 'contest', PERM.PERM_VIEW_CONTEST); Nav('contest_main', {}, 'contest', PERM.PERM_VIEW_CONTEST);
Nav('record_main', {}, 'record'); Nav('record_main', (handler) => (handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) ? { query: { uidOrName: handler.user._id } } : {}), 'record');
Nav('ranking', {}, 'ranking', PERM.PERM_VIEW_RANKING); Nav('ranking', {}, 'ranking', PERM.PERM_VIEW_RANKING);
Nav('domain_dashboard', {}, 'domain', PERM.PERM_EDIT_DOMAIN); Nav('domain_dashboard', {}, 'domain', PERM.PERM_EDIT_DOMAIN);
Nav('manage_dashboard', {}, 'manage', PRIV.PRIV_EDIT_SYSTEM); Nav('manage_dashboard', {}, 'manage', PRIV.PRIV_EDIT_SYSTEM);
+3 -3
View File
@@ -30,7 +30,7 @@ export const PERM = {
PERM_VIEW_PROBLEM_HIDDEN: 1n << 8n, PERM_VIEW_PROBLEM_HIDDEN: 1n << 8n,
PERM_SUBMIT_PROBLEM: 1n << 9n, PERM_SUBMIT_PROBLEM: 1n << 9n,
PERM_READ_PROBLEM_DATA: 1n << 10n, PERM_READ_PROBLEM_DATA: 1n << 10n,
PERM_READ_RECORD_CODE: 1n << 12n, PERM_READ_RECORD: 1n << 12n,
PERM_REJUDGE_PROBLEM: 1n << 13n, PERM_REJUDGE_PROBLEM: 1n << 13n,
PERM_REJUDGE: 1n << 14n, PERM_REJUDGE: 1n << 14n,
@@ -113,7 +113,7 @@ export const PERMS = [
Permission('perm_problem', PERM.PERM_VIEW_PROBLEM_HIDDEN, 'View hidden problems'), Permission('perm_problem', PERM.PERM_VIEW_PROBLEM_HIDDEN, 'View hidden problems'),
Permission('perm_problem', PERM.PERM_SUBMIT_PROBLEM, 'Submit problem'), Permission('perm_problem', PERM.PERM_SUBMIT_PROBLEM, 'Submit problem'),
Permission('perm_problem', PERM.PERM_READ_PROBLEM_DATA, 'Read data of problem'), Permission('perm_problem', PERM.PERM_READ_PROBLEM_DATA, 'Read data of problem'),
Permission('perm_record', PERM.PERM_READ_RECORD_CODE, 'Read record codes'), Permission('perm_record', PERM.PERM_READ_RECORD, 'Read all records'),
Permission('perm_record', PERM.PERM_REJUDGE_PROBLEM, 'Rejudge problems'), Permission('perm_record', PERM.PERM_REJUDGE_PROBLEM, 'Rejudge problems'),
Permission('perm_record', PERM.PERM_REJUDGE, 'Rejudge records'), Permission('perm_record', PERM.PERM_REJUDGE, 'Rejudge records'),
Permission('perm_problem_solution', PERM.PERM_VIEW_PROBLEM_SOLUTION, 'View problem solutions'), Permission('perm_problem_solution', PERM.PERM_VIEW_PROBLEM_SOLUTION, 'View problem solutions'),
@@ -232,7 +232,7 @@ export const PRIV = {
PRIV_USER_PROFILE: 1 << 2, PRIV_USER_PROFILE: 1 << 2,
PRIV_REGISTER_USER: 1 << 3, PRIV_REGISTER_USER: 1 << 3,
PRIV_READ_PROBLEM_DATA: 1 << 4, PRIV_READ_PROBLEM_DATA: 1 << 4,
PRIV_READ_RECORD_CODE: 1 << 7, PRIV_READ_RECORD: 1 << 7,
PRIV_VIEW_HIDDEN_RECORD: 1 << 8, PRIV_VIEW_HIDDEN_RECORD: 1 << 8,
PRIV_JUDGE: 1 << 9, // (renamed) PRIV_JUDGE: 1 << 9, // (renamed)
PRIV_CREATE_DOMAIN: 1 << 10, PRIV_CREATE_DOMAIN: 1 << 10,
@@ -1,5 +1,5 @@
import { dump } from 'js-yaml'; import { dump } from 'js-yaml';
import * as streamsaver from 'streamsaver'; import streamsaver from 'streamsaver';
import { createZipStream } from 'vj/utils/zip'; import { createZipStream } from 'vj/utils/zip';
import pipeStream from 'vj/utils/pipeStream'; import pipeStream from 'vj/utils/pipeStream';
import i18n from 'vj/utils/i18n'; import i18n from 'vj/utils/i18n';
-1
View File
@@ -550,7 +550,6 @@ Rank: 순위
ranking: 순위 ranking: 순위
Read data of own problems: 자신의 문제 데이터 읽기 Read data of own problems: 자신의 문제 데이터 읽기
Read data of problem: 문제 데이터 읽기 Read data of problem: 문제 데이터 읽기
Read record codes: 점수 읽기
Ready (☆▽☆): 준비 완료! (☆▽☆) Ready (☆▽☆): 준비 완료! (☆▽☆)
Ready: 준비됨 Ready: 준비됨
Recent {0} Records: 최근 {0} 점수 Recent {0} Records: 최근 {0} 점수
+2 -2
View File
@@ -584,9 +584,9 @@ Quit Scratchpad: 退出在线编程模式
Quote: 引用 Quote: 引用
Rank: 排名 Rank: 排名
ranking: 排名 ranking: 排名
Read all records: 读取所有提交记录
Read data of own problems: 读取自己题目的数据 Read data of own problems: 读取自己题目的数据
Read data of problem: 读取题目数据 Read data of problem: 读取题目数据
Read record codes: 读取记录的代码
Ready (☆▽☆): 马上开始 (☆▽☆) Ready (☆▽☆): 马上开始 (☆▽☆)
Ready: 即将开始 Ready: 即将开始
Recent {0} Records: 最近 {0} 条记录 Recent {0} Records: 最近 {0} 条记录
@@ -597,7 +597,7 @@ Recently Created Discussions: 最近创建的讨论
Recommended: 推荐 Recommended: 推荐
Record {0} not found.: 记录 {0} 不存在。 Record {0} not found.: 记录 {0} 不存在。
record_detail: 记录详情 record_detail: 记录详情
record_main: 评测队列 record_main: 评测记录
Records: 评测记录 Records: 评测记录
Refresh Records: 刷新评测记录 Refresh Records: 刷新评测记录
Refresh: 刷新 Refresh: 刷新
+1 -1
View File
@@ -353,9 +353,9 @@ QQ Group: QQ 群
QQ Visibility: QQ 可見性 QQ Visibility: QQ 可見性
Quit Scratchpad: 退出線上程式設計模式 Quit Scratchpad: 退出線上程式設計模式
Rank: 排名 Rank: 排名
Read all records: 讀取記錄
Read data of own problems: 讀取自己題目的資料 Read data of own problems: 讀取自己題目的資料
Read data of problem: 讀取題目資料 Read data of problem: 讀取題目資料
Read record codes: 讀取記錄的程式碼
Ready (☆▽☆): 馬上開始 (☆▽☆) Ready (☆▽☆): 馬上開始 (☆▽☆)
Ready: 即將開始 Ready: 即將開始
Recent {0} Records: 最近 {0} 條記錄 Recent {0} Records: 最近 {0} 條記錄
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/ui-default", "name": "@hydrooj/ui-default",
"version": "4.14.15", "version": "4.15.0",
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "hydro.js", "main": "hydro.js",
@@ -73,7 +73,7 @@
<span class="icon icon-edit"></span> {{ _('Edit Contest') }} <span class="icon icon-edit"></span> {{ _('Edit Contest') }}
</a></li> </a></li>
{% endif %} {% endif %}
{% if handler.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE) or handler.user.hasPerm(perm.PERM_READ_RECORD_CODE) %} {% if handler.user.own(tdoc) or handler.user.hasPriv(PRIV.PRIV_READ_RECORD) or handler.user.hasPerm(perm.PERM_READ_RECORD) %}
{% if model.contest.canShowRecord.call(handler, tdoc, true) %} {% if model.contest.canShowRecord.call(handler, tdoc, true) %}
<li class="menu__item"><a class="menu__link" href="{{ url('contest_code', tid=tdoc.docId) }}"> <li class="menu__item"><a class="menu__link" href="{{ url('contest_code', tid=tdoc.docId) }}">
<span class="icon icon-download"></span> {{ _('Export All Code') }} <span class="icon icon-download"></span> {{ _('Export All Code') }}
@@ -57,7 +57,7 @@
<span class="icon icon-edit"></span> {{ _('Edit Homework') }} <span class="icon icon-edit"></span> {{ _('Edit Homework') }}
</a></li> </a></li>
{% endif %} {% endif %}
{% if handler.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE) or handler.user.hasPerm(perm.PERM_READ_RECORD_CODE) %} {% if handler.user.own(tdoc) or handler.user.hasPriv(PRIV.PRIV_READ_RECORD) or handler.user.hasPerm(perm.PERM_READ_RECORD) %}
<li class="menu__item"><a class="menu__link" href="{{ url('homework_code', tid=tdoc.docId) }}"> <li class="menu__item"><a class="menu__link" href="{{ url('homework_code', tid=tdoc.docId) }}">
<span class="icon icon-download"></span> {{ _('Export All Code') }} <span class="icon icon-download"></span> {{ _('Export All Code') }}
</a></li> </a></li>
@@ -11,7 +11,7 @@
<ol class="nav__list nav__list--main clearfix"> <ol class="nav__list nav__list--main clearfix">
<li class="nav__list-item"><a href="/" class="nav__logo" style="background-size: 100% 100%;">&nbsp;</a></li> <li class="nav__list-item"><a href="/" class="nav__logo" style="background-size: 100% 100%;">&nbsp;</a></li>
{%- for item in ui.nodes.nav -%}{% if item.checker(handler) %} {%- for item in ui.nodes.nav -%}{% if item.checker(handler) %}
{{ nav_item(item.name, item.args, item.prefix) }} {{ nav_item(item.name, item.args(handler), item.prefix) }}
{% endif %}{%- endfor -%} {% endif %}{%- endfor -%}
</ol> </ol>
<ol class="nav__list nav__list--secondary clearfix"> <ol class="nav__list nav__list--secondary clearfix">