Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep track of RPC token per-thread #19718

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Keep track of RPC token per-thread #19718

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/msf/core/rpc/v10/service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,16 @@ def process(req)
end
end

::Timeout.timeout(self.dispatcher_timeout) { self.handlers[group].send(mname, *msg) }
::Timeout.timeout(self.dispatcher_timeout) do
Thread.current[:rpc_token] = token
self.handlers[group].send(mname, *msg)
end

rescue ::Exception => e
elog('RPC Exception', error: e)
process_exception(e)
ensure
Thread.current[:rpc_token] = nil
adfoster-r7 marked this conversation as resolved.
Show resolved Hide resolved
end
end

Expand Down
Loading