Fix get

domcloud · Feb 16, 2024 · dfec027 · dfec027
1 parent 436629c
commit dfec027
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/controllers/iptables.js b/src/controllers/iptables.js
@@ -12,11 +12,7 @@ export default function () {
     router.get('/show', async function (req, res, next) {
         try {
             const p = await executor.getParsed();
-            if (req.query.user) {
-                res.json(executor.getByUsers(p, ...(req.query.user.toString()).split(',')));
-            } else {
-                res.json((p));
-            }
+            res.json(p);
         } catch (error) {
             next(error);
         }

diff --git a/src/executor/iptables.js b/src/executor/iptables.js
@@ -13,12 +13,14 @@ const tmpFile6 = path.join(process.cwd(), '/.tmp/ip6tables')
 class IptablesExecutor {
     /**
      * @param {any} parsed
-     * @param {string[]} users
      */
-    getByUsers(parsed, ...users) {
-        return users.map(u => (
-            parsed.filter?.rules.find(x => x["--uid-owner"] === u)
-        ))
+    getByUser(parsed, userName, userID = "") {
+        const setRules = [
+            `-A OUTPUT -m owner --uid-owner ${userID} -j REJECT -m comment --comment "${userName}"`,
+            `-A OUTPUT -m owner --uid-owner ${userName} -j REJECT`,
+        ]
+
+        return parsed.filter.some((x) => setRules.includes(x));
     }
     /**
      * 

diff --git a/src/executor/runner.js b/src/executor/runner.js
@@ -182,7 +182,7 @@ export default async function runConfig(config, domain, writer, sandbox = false)
         let firewallStatusCache = undefined;
         let firewallStatus = async () => {
             if (firewallStatusCache === undefined)
-                firewallStatusCache = !!iptablesExec.getByUsers(await iptablesExec.getParsed(), domaindata['Username'])[0];
+                firewallStatusCache = !!iptablesExec.getByUser(await iptablesExec.getParsed(), domaindata['Username'], domaindata['User ID']);
             return firewallStatusCache;
         };
         if (Array.isArray(config.features)) {