core: security: blacklist: allow no_expire

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.23.11",
+    "version": "2.23.12",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/model/blacklist.ts

@@ -1,3 +1,4 @@
+import moment from 'moment';
 import { ArgMethod } from '../utils';
 import db from '../service/db';
 import * as bus from '../service/bus';
@@ -6,8 +7,12 @@ const coll = db.collection('blacklist');
 
 class BlackListModel {
     @ArgMethod
-    static async add(id: string) {
+    static async add(id: string, expire?: Date | number) {
-        const expireAt = new Date(new Date().getTime() + 365 * 24 * 60 * 60 * 1000);
+        let expireAt;
+        if (expire === 0) expireAt = moment().add(1000, 'years').toDate();
+        if (typeof expire === 'number') expireAt = moment().add(expire, 'months').toDate();
+        else if (expire instanceof Date) expireAt = expire;
+        else expireAt = new Date(new Date().getTime() + 365 * 24 * 60 * 60 * 1000);
         const res = await coll.findOneAndUpdate(
             { _id: id },
             { $set: { expireAt } },
@@ -22,8 +27,8 @@ class BlackListModel {
     }
 
     @ArgMethod
-    static async del(ip: string) {
+    static async del(id: string) {
-        return await coll.deleteOne({ _id: ip });
+        return await coll.deleteOne({ _id: id });
     }
 }