Check granted logic

domcloud · Dec 11, 2024 · f61b801 · f61b801
1 parent 31cb241
commit f61b801
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/controllers/status.js b/src/controllers/status.js
@@ -1,5 +1,6 @@
 import {
     cat,
+    getAuth,
     getRevision,
     getSupportVersions,
     getVersion,
@@ -31,7 +32,11 @@ export default function () {
         })
     });
     router.get('/ip', async function (req, res, next) {
-        res.send(req.ip);
+        if (getAuth(req)) {
+            res.json({ ip: req.ip, granted: true })
+        } else {
+            res.json({ ip: req.ip })
+        }
     });
     router.get('/check', async function (req, res, next) {
         try {

diff --git a/src/util.js b/src/util.js
@@ -4,6 +4,7 @@ import { lock } from 'proper-lockfile';
 import fs from 'fs';
 import binaries from './binaries/metadata.cjs';
 import { virtualminExec } from './executor/virtualmin.js';
+import { emitWarning } from 'process';
 const {
     javaVersionsList,
     javaVersionsMap,
@@ -202,16 +203,19 @@ export const getRevision = () => {
     return revision;
 }
 
+export const getAuth = (/** @type {import('express').Request} */ req) => {
+    return req.headers.authorization === tokenSecret && (!allowIps || allowIps[req.ip])
+}
+
 export const checkAuth = function (
     /** @type {import('express').Request} */
     req,
     /** @type {import('express').Response} */
     res,
     /** @type {any} */
     next) {
-    if (req.headers.authorization === tokenSecret) {
-        if (!allowIps || allowIps[req.ip])
-            return next();
+    if (getAuth(req)) {
+        return next();
     }
     if (process.env.NODE_ENV === 'development') {
         return next();