import without pid check, fix bulk, upgrade dep

packages/hydrooj/src/entry/setup.ts

@@ -5,99 +5,73 @@ import fs from 'fs-extra';
 import Koa, { Context } from 'koa';
 import Body from 'koa-body';
 import cache from 'koa-static-cache';
-import nunjucks from 'nunjucks';
 import mongodb from 'mongodb';
 import { argv } from 'yargs';
 
 const listenPort = argv.port || 8888;
 
-class Loader {
-    getSource(name: string) { // eslint-disable-line class-methods-use-this
-        return {
-            src: `
-            <!DOCTYPE html>
-            <html data-page="setup" data-layout="immersive" class="layout--immersive page--setup nojs">
-            <head>
-              <meta charset="UTF-8">
-              <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-              <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
-              <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-              <meta name="msapplication-TileColor" content="#579e9a">
-              <meta name="theme-color" content="#56758f">
-              <link rel="stylesheet" media="all" href="/vj4.css">
-              <title>{{ _('Setup') }}</title>
-            </head>
-            <body>
-            <div class="slideout-panel" id="panel">
-              <div class="main">
-                <div class="row"><div class="columns">
-                <div class="immersive--content immersive--center">
-                  <h1>{{ _('Setup') }}</h1>
-                  <form method="POST">
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Database Host') }}
-                        <input name="host" type="text" value="127.0.0.1" autofocus>
-                      </label>
-                    </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Database Port') }}
-                        <input name="port" type="number" value="27017">
-                      </label>
-                    </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Database Name') }}
-                        <input name="name" type="text" value="hydro">
-                      </label>
-                    </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Database Username') }}
-                        <input name="username" type="text" placeholder="{{ _('Leave blank if none') }}">
-                      </label>
-                    </div></div>
-                    <div class="row"><div class="columns">
-                      <label class="inverse material textbox">
-                        {{ _('Database Password') }}
-                        <input name="password" type="password" placeholder="{{ _('Leave blank if none') }}">
-                      </label>
-                    </div></div>
-                    <div class="row"><div class="columns">
-                      <div class="text-center">
-                        <input type="submit" value="{{ _('Confirm') }}" class="inverse expanded rounded primary button">
-                      </div>
-                    </div></div>
-                  </form>
-                </div>
-                </div></div>
-              </div>
-            </div>
-            </body>
-            </html>
-            `,
-            path: name,
-            noCache: false,
-        };
-    }
-}
-
-const env = new nunjucks.Environment(new Loader(), { autoescape: true, trimBlocks: true });
-
-function render(name: string) {
-    return new Promise((resolve, reject) => {
-        env.render(name, {
-            _: (str: string) => str,
-        }, (err, res) => {
-            if (err) reject(err);
-            else resolve(res);
-        });
-    });
-}
-
 async function get(ctx: Context) {
-    ctx.body = await render('setup.html');
+    ctx.body = `<!DOCTYPE html>
+    <html data-page="setup" data-layout="immersive" class="layout--immersive page--setup nojs">
+    <head>
+      <meta charset="UTF-8">
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+      <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
+      <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+      <meta name="msapplication-TileColor" content="#579e9a">
+      <meta name="theme-color" content="#56758f">
+      <link rel="stylesheet" media="all" href="/vj4.css">
+      <title>Setup</title>
+    </head>
+    <body>
+    <div class="slideout-panel" id="panel">
+      <div class="main">
+        <div class="row"><div class="columns">
+        <div class="immersive--content immersive--center">
+          <h1>Setup</h1>
+          <form method="POST">
+            <div class="row"><div class="columns">
+              <label class="inverse material textbox">
+                Database Host
+                <input name="host" type="text" value="127.0.0.1" autofocus>
+              </label>
+            </div></div>
+            <div class="row"><div class="columns">
+              <label class="inverse material textbox">
+                Database Port
+                <input name="port" type="number" value="27017">
+              </label>
+            </div></div>
+            <div class="row"><div class="columns">
+              <label class="inverse material textbox">
+                Database Name
+                <input name="name" type="text" value="hydro">
+              </label>
+            </div></div>
+            <div class="row"><div class="columns">
+              <label class="inverse material textbox">
+                Database Username
+                <input name="username" type="text" placeholder="Leave blank if none">
+              </label>
+            </div></div>
+            <div class="row"><div class="columns">
+              <label class="inverse material textbox">
+                Database Password
+                <input name="password" type="password" placeholder="Leave blank if none">
+              </label>
+            </div></div>
+            <div class="row"><div class="columns">
+              <div class="text-center">
+                <input type="submit" value="Confirm" class="inverse expanded rounded primary button">
+              </div>
+            </div></div>
+          </form>
+        </div>
+        </div></div>
+      </div>
+    </div>
+    </body>
+    </html>`;
     ctx.response.type = 'text/html';
 }
 

packages/hydrooj/src/handler/import.ts

@@ -10,10 +10,6 @@ import {
 import { isPid } from '../lib/validator';
 
 class ProblemImportHandler extends Handler {
-    async prepare() {
-        this.checkPerm(PERM.PERM_CREATE_PROBLEM);
-    }
-
     async get() {
         this.response.template = 'problem_import.html';
         this.response.body = {
@@ -26,7 +22,7 @@ class ProblemImportHandler extends Handler {
     }
 
     @param('url', Types.String)
-    @param('pid', Types.String, isPid)
+    @param('pid', Types.String, true, isPid)
     @param('hidden', Types.Boolean)
     @param('remoteType', Types.String)
     async post(domainId: string, url: string, pid: string, hidden = false, remoteType: string) {
@@ -55,7 +51,7 @@ class ProblemImportHandler extends Handler {
 }
 
 export async function apply() {
-    Route('problem_import', '/problem/import', ProblemImportHandler);
+    Route('problem_import', '/problem/import', ProblemImportHandler, PERM.PERM_CREATE_PROBLEM);
 }
 
 global.Hydro.handler.import = apply;

packages/hydrooj/src/lib/superagent.ts

@@ -1,52 +0,0 @@
-import superagent from 'superagent';
-import proxyAgent from 'proxy-agent';
-
-namespace Proxy {
-    function getUrl() {
-        return this._url;
-    }
-    function setUrl(v: string) {
-        this._url = v;
-        // eslint-disable-next-line no-use-before-define
-        proxy.call(this, this._proxyUri);
-    }
-    function setupUrl(req: superagent.Request) {
-        const desc = Object.getOwnPropertyDescriptor(req, 'url');
-        if (desc.get === getUrl && desc.set === setUrl) return;
-        // @ts-ignore
-        req._url = req.url;
-        desc.get = getUrl;
-        desc.set = setUrl;
-        delete desc.value;
-        delete desc.writable;
-        Object.defineProperty(req, 'url', desc);
-    }
-    function proxy(uri: string) {
-        if (!uri) return this;
-        setupUrl(this);
-        const agent = proxyAgent(uri);
-        if (agent) this.agent(agent);
-        this._proxyUri = uri;
-        return this;
-    }
-    export function setup(agent, uri = '') {
-        const Request = agent.Request;
-        if (Request) {
-            Request.prototype.proxy = proxy;
-            return agent;
-        }
-        return proxy.call(agent, uri);
-    }
-}
-
-declare module 'superagent' {
-    namespace request {
-        interface Request {
-            proxy(url: string): this;
-        }
-    }
-}
-
-Proxy.setup(superagent);
-
-export = superagent;

packages/hydrooj/src/model/user.ts

@@ -184,7 +184,7 @@ export async function create(
             mailLower: mail.trim().toLowerCase(),
             uname,
             unameLower: uname.trim().toLowerCase(),
-            hash: pwhash(password, salt),
+            hash: pwhash(password.toString(), salt),
             salt,
             hashType: 'hydro',
             regat: new Date(),
@@ -195,6 +195,7 @@ export async function create(
             gravatar: mail,
         });
     } catch (e) {
+        console.log(e);
         throw new UserAlreadyExistError([uid, uname, mail]);
     }
     return uid;