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

Fixed merge conflict

Browse Source
This commit is contained in:
aaron
2020-04-02 17:17:21 +10:00
parent 89c08b5ffd
commit 7c1c7d6108
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,13 +36,6 @@ module BeEF
offline_hooks = hb_to_json(BeEF::Core::Models::HookedBrowser.where('lastseen <= ?', (Time.new.to_i - timeout)))
end
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
>>>>>>> 6ebb8a0e04541f26c0aeb5f9034b7c99695c6ddd
output = {
'hooked-browsers' => {
'online' => online_hooks,