tweak(menu): added grace period for webpipe while closed warning

tabarra · Oct 13, 2024 · fccd7ad · fccd7ad
1 parent c00e224
commit fccd7ad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/resource/menu/client/cl_base.lua b/resource/menu/client/cl_base.lua
@@ -7,6 +7,7 @@
 -- TODO: they should be upper case
 menuIsAccessible = false
 isMenuVisible = false
+tsLastMenuClose = 0
 menuPermissions = {}
 lastTpCoords = false;
 
@@ -186,6 +187,7 @@ end)
 -- When the escape key is pressed in menu
 RegisterSecureNuiCallback('closeMenu', function(_, cb)
   isMenuVisible = false
+  tsLastMenuClose = GetGameTimer()
   debugPrint('Releasing all NUI Focus')
   SetNuiFocus(false)
   SetNuiFocusKeepInput(false)

diff --git a/resource/menu/client/cl_functions.lua b/resource/menu/client/cl_functions.lua
@@ -87,6 +87,7 @@ function toggleMenuVisibility(visible)
     if not isMenuVisible then
         SetNuiFocus(false)
         SetNuiFocusKeepInput(false)
+        tsLastMenuClose = GetGameTimer()
     end
     playLibrarySound('enter')
 end

diff --git a/resource/menu/client/cl_webpipe.lua b/resource/menu/client/cl_webpipe.lua
@@ -9,6 +9,7 @@ if not TX_MENU_ENABLED then return end
 -- Vars
 local pipeReturnCallbacks = {}
 local pipeCallbackCounter = 1
+local menuCloseGracePeriod = 750
 
 ---@class StaticCacheEntry
 ---@field body string
@@ -19,14 +20,24 @@ local staticCacheData = {}
 
 -- catching all NUI requests for https://monitor/WebPipe/
 RegisterRawNuiCallback('WebPipe', function(req, cb)
-    if not menuIsAccessible or not isMenuVisible then
-        return txPrint('^1NUI request received while the menu is not accessible or visible.')
-    end
-
     local path = req.path
     local headers = req.headers
     local body = req.body
     local method = req.method
+
+    --Check if the menu is accessible and visible, otherwise it might be a CSRF attempt
+    --Does not trigger within a 750ms grace period after the menu is closed
+    if
+        (not menuIsAccessible or not isMenuVisible)
+        and (GetGameTimer() - tsLastMenuClose) > menuCloseGracePeriod
+    then
+        txPrint('^1NUI WebPipe request received the request below while the menu is not accessible or visible:')
+        txPrint(('^3%s %s'):format(method, string.sub(path, 1, 100)))
+        return cb({
+            status = 403,
+            body = '{}',
+        })
+    end
     debugPrint(("^3WebPipe[^1%d^3]^0 ^2%s ^4%s^0"):format(pipeCallbackCounter, method, path))
 
     -- Check for CSRF attempt