Merge branch 'master' into contest-access-lock

packages/hydrooj/src/handler/contest.ts

@@ -3,7 +3,9 @@ import { statSync } from 'fs-extra';
 import { pick } from 'lodash';
 import moment from 'moment-timezone';
 import { ObjectID } from 'mongodb';
-import { Counter, sortFiles, Time } from '@hydrooj/utils/lib/utils';
+import {
+    Counter, sortFiles, streamToBuffer, Time,
+} from '@hydrooj/utils/lib/utils';
 import {
     BadRequestError, ContestNotEndedError, ContestNotFoundError, ContestNotLiveError,
     ContestScoreboardHiddenError, FileLimitExceededError, FileUploadError, ForbiddenError,
@@ -506,9 +508,18 @@ export class ContestCodeHandler extends Handler {
         const rdocs = await record.getMulti(domainId, {
             _id: { $in: Array.from(Object.keys(rnames)).map((id) => new ObjectID(id)) },
         }).toArray();
-        for (const rdoc of rdocs) {
-            zip.addFile(`${rnames[rdoc._id.toHexString()]}.${rdoc.lang}`, Buffer.from(rdoc.code));
-        }
+        await Promise.all(rdocs.map(async (rdoc) => {
+            if (rdoc.files?.code) {
+                const [id, filename] = rdoc.files?.code?.split('#') || [];
+                if (!id) return;
+                zip.addFile(
+                    `${rnames[rdoc._id.toHexString()]}.${filename || 'txt'}`,
+                    await streamToBuffer(storage.get(id)),
+                );
+            } else if (rdoc.code) {
+                zip.addFile(`${rnames[rdoc._id.toHexString()]}.${rdoc.lang}`, Buffer.from(rdoc.code));
+            }
+        }));
         this.binary(zip.toBuffer(), `${tdoc.title}.zip`);
     }
 }

packages/hydrooj/src/handler/problem.ts

@@ -444,6 +444,7 @@ export class ProblemDetailHandler extends ContestDetailBaseHandler {
             contest: { $ne: new ObjectID('0'.repeat(24)) },
             'files.hack': { $exists: false },
         }).project({ _id: 1, contest: 1 }).toArray();
+        if (!this.pdoc.config || typeof this.pdoc.config === 'string') throw new ProblemConfigError();
         const priority = await record.submissionPriority(this.user._id, -10000 - rdocs.length * 5 - 50);
         await record.reset(domainId, rdocs.map((rdoc) => rdoc._id), true);
         await Promise.all([
@@ -527,13 +528,13 @@ export class ProblemSubmitHandler extends ProblemDetailHandler {
             if (!file || file.size === 0) throw new ValidationError('code');
             const sizeLimit = config.type === 'submit_answer' ? 128 * 1024 * 1024 : 65535;
             if (file.size > sizeLimit) throw new ValidationError('file');
-            if (file.size > 65535 || await isBinaryFile(file.filepath, file.size)) {
+            if (config.type !== 'submit_answer' || (file.size < 65535 && !await isBinaryFile(file.filepath, file.size))) {
+                // TODO auto detect & convert encoding
+                code = await readFile(file.filepath, 'utf-8');
+            } else {
                 const id = nanoid();
                 await storage.put(`submission/${this.user._id}/${id}`, file.filepath, this.user._id);
                 files.code = `${this.user._id}/${id}#${file.originalFilename}`;
-            } else {
-                // TODO auto detect & convert encoding
-                code = await readFile(file.filepath, 'utf-8');
             }
         }
         const rid = await record.add(

packages/hydrooj/src/handler/record.ts

@@ -1,7 +1,8 @@
 import { omit, pick, throttle } from 'lodash';
 import { FilterQuery, ObjectID } from 'mongodb';
 import {
-    ContestNotAttendedError, ContestNotFoundError, HackRejudgeFailedError, PermissionError,
+    ContestNotAttendedError, ContestNotFoundError, HackRejudgeFailedError,
+    PermissionError, ProblemConfigError,
     ProblemNotFoundError, RecordNotFoundError, UserNotFoundError,
 } from '../error';
 import { RecordDoc, Tdoc } from '../interface';
@@ -191,6 +192,8 @@ class RecordDetailHandler extends ContestDetailBaseHandler {
 
     @param('rid', Types.ObjectID)
     async postRejudge(domainId: string, rid: ObjectID) {
+        const pdoc = await problem.get(domainId, this.rdoc.pid);
+        if (!pdoc?.config || typeof pdoc.config === 'string') throw new ProblemConfigError();
         const priority = await record.submissionPriority(this.user._id, -20);
         const isContest = this.rdoc.contest && this.rdoc.contest.toString() !== '000000000000000000000000';
         await record.reset(domainId, rid, true);

packages/hydrooj/src/handler/user.ts

@@ -129,7 +129,7 @@ class UserLoginHandler extends Handler {
         if (udoc._tfa && !verifyToken(udoc._tfa, tfa)) throw new InvalidTokenError('2FA');
         udoc.checkPassword(password);
         await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip });
-        if (!udoc.hasPriv(PRIV.PRIV_USER_PROFILE)) throw new BlacklistedError(uname);
+        if (!udoc.hasPriv(PRIV.PRIV_USER_PROFILE)) throw new BlacklistedError(uname, udoc.banReason);
         this.session.viewLang = '';
         this.session.uid = udoc._id;
         this.session.sudo = null;
@@ -471,5 +471,5 @@ export async function apply(ctx) {
     ctx.Route('user_lostpass', '/lostpass', UserLostPassHandler);
     ctx.Route('user_lostpass_with_code', '/lostpass/:code', UserLostPassWithCodeHandler);
     ctx.Route('user_delete', '/user/delete', UserDeleteHandler, PRIV.PRIV_USER_PROFILE);
-    ctx.Route('user_detail', '/user/:uid', UserDetailHandler);
+    ctx.Route('user_detail', '/user/:uid(-?\\d+)', UserDetailHandler);
 }