core: api: ObjectID validation

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.1.10",
+    "version": "3.1.11",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
@@ -12,6 +12,7 @@
     },
     "preferUnplugged": true,
     "dependencies": {
+        "@graphql-tools/schema": "^8.3.1",
         "@hydrooj/utils": "workspace:*",
         "adm-zip": "0.5.5",
         "ansi_up": "^5.0.1",

packages/hydrooj/src/handler/api.ts

@@ -1,4 +1,5 @@
-import graphql from 'graphql';
+import { makeExecutableSchema } from '@graphql-tools/schema';
+import { graphql, GraphQLSchema } from 'graphql';
 import { resolvers, typeDefs } from 'graphql-scalars';
 import * as bus from '../service/bus';
 import { Handler, Route } from '../service/server';
@@ -6,7 +7,9 @@ import { Handler, Route } from '../service/server';
 const types: Record<string, Record<string, string>> = {};
 const unions: Record<string, string> = {};
 const descriptions: Record<string, Record<string, string>> = {};
-const handlers: Record<string, Record<string, any>> = {};
+const handlers: Record<string, Record<string, any>> = {
+    Query: {},
+};
 let root: Record<string, any> = {};
 
 export function registerValue(typeName: string, key: string, value: string, description?: string): void;
@@ -51,30 +54,32 @@ function setDescription(desc: string) {
     return JSON.stringify(desc);
 }
 
-function buildSchemaStr() {
+let schema: GraphQLSchema;
-    let res = `${Object.keys(unions).map((i) => `union ${i} = ${unions[i]}`)}\n${typeDefs.join('\n')}\n`;
+let schemaStr = '';
-    for (const key in types) {
+root = handlers.Query;
-        if (descriptions[key]?._description) res += `${setDescription(descriptions[key]._description)}\n`;
-        res += `type ${key}{\n`;
-        for (const k in types[key]) {
-            if (descriptions[key]?.[k]) res += `  ${setDescription(descriptions[key][k])}\n`;
-            res += `  ${k}: ${types[key][k]}\n`;
-        }
-        res += '}\n';
-    }
-    return res;
-}
-
-let schemaStr = buildSchemaStr();
-let schema = graphql.buildSchema(schemaStr);
-root = { ...handlers.Query, ...resolvers };
 
 export function rebuild() {
     try {
-        const str = buildSchemaStr();
+        const defs = [
-        schema = graphql.buildSchema(str);
+            ...Object.keys(unions).map((i) => `union ${i} = ${unions[i]}`),
-        schemaStr = str;
+            ...typeDefs,
-        root = { ...handlers.Query, ...resolvers };
+            ...Object.keys(types).map((key) => {
+                let def = '';
+                if (descriptions[key]?._description) def += `${setDescription(descriptions[key]._description)}\n`;
+                def += `type ${key}{\n`;
+                for (const k in types[key]) {
+                    if (descriptions[key]?.[k]) def += `  ${setDescription(descriptions[key][k])}\n`;
+                    def += `  ${k}: ${types[key][k]}\n`;
+                }
+                def += '}\n';
+                return def;
+            }),
+        ];
+        schema = makeExecutableSchema({
+            typeDefs: defs,
+            resolvers,
+        });
+        schemaStr = defs.join('\n');
     } catch (e) {
         console.error(e);
     }
@@ -85,6 +90,11 @@ bus.on('app/started', () => {
 });
 
 class ApiHandler extends Handler {
+    async query(q: string, variables: any) {
+        // FIXME validation for fields like ObjectID doesn't work.
+        return graphql(schema, q, root, this, variables);
+    }
+
     async get() {
         const q = decodeURIComponent(this.ctx.request.querystring);
         if (q === 'schema') {
@@ -92,15 +102,10 @@ class ApiHandler extends Handler {
             this.response.body = { schema: schemaStr };
         } else if (q) {
             this.response.type = 'application/json';
-            this.response.body = await graphql.graphql(schema, q, root, this);
+            this.response.body = await this.query(q, {});
         } else this.response.template = 'api.html';
     }
 
-    async query(q: string, variables: any) {
-        // FIXME validation for fields like ObjectID doesn't work.
-        return graphql.graphql(schema, q, root, this, variables);
-    }
-
     async post() {
         this.response.type = 'application/json';
         this.response.body = await this.query(this.args.query, this.args.variables);

packages/hydrooj/src/handler/judge.ts

@@ -167,7 +167,7 @@ class JudgeConnectionHandler extends ConnectionHandler {
     }
 
     async message(msg) {
-        if (msg.key !== 'ping') logger[['status', 'next'].includes(msg.key) ? 'debug' : 'info']('%o', msg);
+        if (msg.key !== 'ping' && msg.key !== 'prio') logger[['status', 'next'].includes(msg.key) ? 'debug' : 'info']('%o', msg);
         if (msg.key === 'next') await next(msg);
         else if (msg.key === 'end') {
             await end({ judger: this.user._id, ...msg }).catch((e) => logger.error(e));

packages/hydrooj/src/handler/problem.ts

@@ -76,7 +76,7 @@ registerResolver(
 );
 registerResolver(
     'Problem', 'manage', 'ProblemManage',
-    async (arg, ctx) => {
+    (arg, ctx) => {
         if (!ctx.user.own(ctx.pdoc, PERM.PERM_EDIT_PROBLEM_SELF)) ctx.checkPerm(PERM.PERM_EDIT_PROBLEM);
         return {};
     },