Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1888 from beefproject/fixed_offline_browser_bug_when_using_websockets

Browse Source 
Changed how websocket hooked browsers time out
This commit is contained in:
jcrew99
2020-04-02 16:23:35 +10:00
committed by GitHub
parent 803fd6d3e7 1b837dbd27
commit 6ebb8a0e04
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/main/rest/handlers/hookedbrowsers.rb
View File

@@ -22,11 +22,18 @@ module BeEF
#
# @note Get online and offline hooked browsers details (like name, version, os, ip, port, ...)
# When websockets are enabled this will allow the ws_poll_timeout config to be used to check if the browser is online or not.
#
get '/' do
online_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen >= ?', (Time.new.to_i - 15)))
offline_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen <= ?', (Time.new.to_i - 15)))
if config.get('beef.http.websocket.enable') == false
online_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen >= ?', (Time.new.to_i - 15)))
offline_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen <= ?', (Time.new.to_i - 15)))
else
timeout = (config.get('beef.http.websocket.ws_poll_timeout').to_i / 1000) + 5
online_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen >= ?', (Time.new.to_i - timeout)))
offline_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen <= ?', (Time.new.to_i - timeout)))
end
output = {
'hooked-browsers' => {
'online' => online_hooks,