Add back ip ban

databases/_private_indexes.sql

@@ -4,6 +4,10 @@ CREATE INDEX IF NOT EXISTS "privateDB_sponsorTimes_v4"
     ON public."sponsorTimes" USING btree
     ("videoID" ASC NULLS LAST, service COLLATE pg_catalog."default" ASC NULLS LAST, "timeSubmitted" ASC NULLS LAST);
 
+CREATE INDEX IF NOT EXISTS "privateDB_time"
+    ON public."sponsorTimes" USING btree
+    ("timeSubmitted" ASC NULLS LAST);
+
 -- votes
 
 CREATE INDEX IF NOT EXISTS "votes_userID"

src/routes/shadowBanUser.ts

@@ -1,8 +1,8 @@
-import { db } from "../databases/databases";
+import { db, privateDB } from "../databases/databases";
 import { getHashCache } from "../utils/getHashCache";
 import { Request, Response } from "express";
 import { config } from "../config";
-import { Category, DeArrowType, Service, VideoID, VideoIDHash } from "../types/segments.model";
+import { Category, DeArrowType, HashedIP, Service, VideoID, VideoIDHash } from "../types/segments.model";
 import { UserID } from "../types/user.model";
 import { QueryCacher } from "../utils/queryCacher";
 import { isUserVIP } from "../utils/isUserVIP";
@@ -20,6 +20,7 @@ export async function shadowBanUser(req: Request, res: Response): Promise<Respon
     const enabled = req.query.enabled === undefined
         ? true
         : req.query.enabled === "true";
+    const lookForIPs = req.query.lookForIPs2 === "true";
 
     //if enabled is false and the old submissions should be made visible again
     const unHideOldSubmissions = req.query.unHideOldSubmissions !== "false";
@@ -42,6 +43,19 @@ export async function shadowBanUser(req: Request, res: Response): Promise<Respon
             return res.sendStatus(403);
         }
         const result = await banUser(userID, enabled, unHideOldSubmissions, type, categories, deArrowTypes);
+
+        if (enabled && lookForIPs) {
+            const ipLoggingFixedTime = 1675295716000;
+            const timeSubmitted = (await db.prepare("all", `SELECT "timeSubmitted" FROM "sponsorTimes" WHERE "timeSubmitted" > ? AND "userID" = ?`, [ipLoggingFixedTime, userID])) as { timeSubmitted: number }[];
+            const ips = (await Promise.all(timeSubmitted.map((s) => {
+                return privateDB.prepare("all", `SELECT "hashedIP" FROM "sponsorTimes" WHERE "timeSubmitted" = ?`, [s.timeSubmitted]) as Promise<{ hashedIP: HashedIP }[]>;
+            }))).flat();
+
+            await Promise.all([...new Set(ips.map((ip) => ip.hashedIP))].map((ip) => {
+                return banIP(ip, unHideOldSubmissions, type, categories, deArrowTypes);
+            }));
+        }
+
         if (result) {
             res.sendStatus(result);
             return;
@@ -125,3 +139,48 @@ async function unHideSubmissionsByUser(categories: string[], deArrowTypes: DeArr
             QueryCacher.clearBrandingCache(videoInfo);
         });
 }
+
+export async function banIP(hashedIP: HashedIP, unHideOldSubmissions: boolean, type: number,
+    categories: Category[], deArrowTypes: DeArrowType[]): Promise<number> {
+
+    //check to see if this user is already shadowbanned
+    const row = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedIPs" WHERE "hashedIP" = ?`, [hashedIP]);
+
+    if (row.userCount == 0) {
+        await db.prepare("run", `INSERT INTO "shadowBannedIPs" VALUES(?)`, [hashedIP]);
+    }
+
+    //find all previous submissions and hide them
+    if (unHideOldSubmissions) {
+        const users = await unHideSubmissionsByIP(categories, hashedIP, type);
+
+        await Promise.all([...users].map((user) => {
+            return banUser(user, true, unHideOldSubmissions, type, categories, deArrowTypes);
+        }));
+    } else if (row.userCount > 0) {
+        // Nothing to do, and already added
+        return 409;
+    }
+
+    return 200;
+}
+
+async function unHideSubmissionsByIP(categories: string[], hashedIP: HashedIP, type = 1): Promise<Set<UserID>> {
+    const submissions = await privateDB.prepare("all", `SELECT "timeSubmitted" FROM "sponsorTimes" WHERE "hashedIP" = ?`, [hashedIP]) as { timeSubmitted: number }[];
+
+    const users: Set<UserID> = new Set();
+    await Promise.all(submissions.map(async (submission) => {
+        (await db.prepare("all", `SELECT "videoID", "hashedVideoID", "service", "votes", "views", "userID" FROM "sponsorTimes" WHERE "timeSubmitted" = ? AND "category" in (${categories.map((c) => `'${c}'`).join(",")})`, [submission.timeSubmitted]))
+            .forEach((videoInfo: { category: Category, videoID: VideoID, hashedVideoID: VideoIDHash, service: Service, userID: UserID }) => {
+                QueryCacher.clearSegmentCache(videoInfo);
+                users.add(videoInfo.userID);
+            }
+            );
+
+        await db.prepare("run", `UPDATE "sponsorTimes" SET "shadowHidden" = ${type} WHERE "timeSubmitted" = ? AND "category" in (${categories.map((c) => `'${c}'`).join(",")})
+            AND NOT EXISTS ( SELECT "videoID", "category" FROM "lockCategories" WHERE
+            "sponsorTimes"."videoID" = "lockCategories"."videoID" AND "sponsorTimes"."service" = "lockCategories"."service" AND "sponsorTimes"."category" = "lockCategories"."category")`, [submission.timeSubmitted]);
+    }));
+
+    return users;
+}

test/cases/shadowBanUser.ts

@@ -1,4 +1,4 @@
-import { db } from "../../src/databases/databases";
+import { db, privateDB } from "../../src/databases/databases";
 import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
 import { Category, Service } from "../../src/types/segments.model";
@@ -10,6 +10,7 @@ describe("shadowBanUser", () => {
     const getShadowBanSegmentCategory = (userID: string, status: number): Promise<{shadowHidden: number, category: Category}[]> => db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, [userID, status]);
     const getShadowBanTitles = (userID: string, status: number) => db.prepare("all", `SELECT tv."shadowHidden" FROM "titles" t JOIN "titleVotes" tv ON t."UUID" = tv."UUID" WHERE t."userID" = ? AND tv."shadowHidden" = ?`, [userID, status]);
     const getShadowBanThumbnails = (userID: string, status: number) => db.prepare("all", `SELECT tv."shadowHidden" FROM "thumbnails" t JOIN "thumbnailVotes" tv ON t."UUID" = tv."UUID" WHERE t."userID" = ? AND tv."shadowHidden" = ?`, [userID, status]);
+    const getIPShadowBan = (hashedIP: string) => db.prepare("get", `SELECT * FROM "shadowBannedIPs" WHERE "hashedIP" = ?`, [hashedIP]);
 
     const endpoint = "/api/shadowBanUser";
     const VIPuserID = "shadow-ban-vip";
@@ -56,6 +57,14 @@ describe("shadowBanUser", () => {
 
         await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES(?)`, [getHash(VIPuserID)]);
 
+        const privateInsertQuery = `INSERT INTO "sponsorTimes" ("videoID", "hashedIP", "timeSubmitted", "service") VALUES(?, ?, ?, ?)`;
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916068933, "YouTube"]);
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916062936, "YouTube"]);
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916064324, "YouTube"]);
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916062443, "YouTube"]);
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916062342, "YouTube"]);
+        await privateDB.prepare("run", privateInsertQuery, [video, "shadowBannedIP8", 1674590916069491, "YouTube"]);
+
         const titleQuery = `INSERT INTO "titles" ("videoID", "title", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?, ?)`;
         const titleVotesQuery = `INSERT INTO "titleVotes" ("UUID", "votes", "locked", "shadowHidden", "verification") VALUES (?, ?, ?, ?, ?)`;
         const thumbnailQuery = `INSERT INTO "thumbnails" ("videoID", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?)`;
@@ -392,6 +401,39 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
+    it("Should be able to ban user by userID and other users who used that IP and hide specific category", (done) => {
+        const hashedIP = "shadowBannedIP8";
+        const userID = "shadowBanned8";
+        const userID2 = "shadowBanned9";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                enabled: true,
+                categories: `["sponsor", "intro"]`,
+                unHideOldSubmissions: true,
+                adminUserID: VIPuserID,
+                lookForIPs2: true
+            }
+        })
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const videoRow = await getShadowBanSegments(userID, 1);
+                const videoRow2 = await getShadowBanSegments(userID2, 1);
+                const normalShadowRow = await getShadowBan(userID);
+                const normalShadowRow2 = await getShadowBan(userID2);
+                const ipShadowRow = await getIPShadowBan(hashedIP);
+                assert.ok(ipShadowRow);
+                assert.ok(normalShadowRow);
+                assert.ok(normalShadowRow2);
+                assert.strictEqual(videoRow.length, 2);
+                assert.strictEqual(videoRow2.length, 2);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
     it("Should be able to ban user and hide dearrow submissions", (done) => {
         const userID = "userID1-ban";
         client({