Skip to content

[Backport support/2.15] Take a mutex before accessing the l_ApiScriptFrames #10740

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

Merged
jschmidt-icinga merged 1 commit into from
Mar 12, 2026
+31 −21
Merged

[Backport support/2.15] Take a mutex before accessing the l_ApiScriptFrames #10740

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
52 changes: 31 additions & 21 deletions lib/remote/consolehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,22 @@
#include "remote/httputility.hpp"
#include "remote/filterutility.hpp"
#include "config/configcompiler.hpp"
#include "base/configtype.hpp"
#include "base/configwriter.hpp"
#include "base/scriptglobal.hpp"
#include "base/logger.hpp"
#include "base/serializer.hpp"
#include "base/timer.hpp"
#include "base/namespace.hpp"
#include "base/initialize.hpp"
#include "base/utility.hpp"
#include <boost/thread/once.hpp>
#include <set>
#include <memory>

using namespace icinga;

REGISTER_URLHANDLER("/v1/console", ConsoleHandler);

static std::mutex l_QueryMutex;
static std::map<String, ApiScriptFrame> l_ApiScriptFrames;
static std::map<String, std::shared_ptr<ApiScriptFrame>> l_ApiScriptFrames;
static Timer::Ptr l_FrameCleanupTimer;
static std::mutex l_ApiScriptMutex;

Expand All @@ -33,7 +31,7 @@ static void ScriptFrameCleanupHandler()
std::vector<String> cleanup_keys;

for (auto& kv : l_ApiScriptFrames) {
if (kv.second.Seen < Utility::GetTime() - 1800)
if (kv.second->Seen < Utility::GetTime() - 1800)
cleanup_keys.push_back(kv.first);
}

Expand All @@ -53,6 +51,18 @@ static void EnsureFrameCleanupTimer()
});
}

static std::shared_ptr<ApiScriptFrame> GetOrCreateScriptFrame(const String& session) {
std::unique_lock<std::mutex> lock(l_ApiScriptMutex);
auto& frame = l_ApiScriptFrames[session];

// If no session was found, create a new one
if (!frame) {
frame = std::make_shared<ApiScriptFrame>();
}

return frame;
}

bool ConsoleHandler::HandleRequest(
const WaitGroup::Ptr&,
AsioTlsStream& stream,
Expand Down Expand Up @@ -115,16 +125,16 @@ bool ConsoleHandler::ExecuteScriptHelper(boost::beast::http::request<boost::beas

EnsureFrameCleanupTimer();

ApiScriptFrame& lsf = l_ApiScriptFrames[session];
lsf.Seen = Utility::GetTime();
auto lsf = GetOrCreateScriptFrame(session);
lsf->Seen = Utility::GetTime();

if (!lsf.Locals)
lsf.Locals = new Dictionary();
if (!lsf->Locals)
lsf->Locals = new Dictionary();

String fileName = "<" + Convert::ToString(lsf.NextLine) + ">";
lsf.NextLine++;
String fileName = "<" + Convert::ToString(lsf->NextLine) + ">";
lsf->NextLine++;

lsf.Lines[fileName] = command;
lsf->Lines[fileName] = command;

Dictionary::Ptr resultInfo;
std::unique_ptr<Expression> expr;
Expand All @@ -134,8 +144,8 @@ bool ConsoleHandler::ExecuteScriptHelper(boost::beast::http::request<boost::beas
expr = ConfigCompiler::CompileText(fileName, command);

ScriptFrame frame(true);
frame.Locals = lsf.Locals;
frame.Self = lsf.Locals;
frame.Locals = lsf->Locals;
frame.Self = lsf->Locals;
frame.Sandboxed = sandboxed;

exprResult = expr->Evaluate(frame);
Expand All @@ -150,7 +160,7 @@ bool ConsoleHandler::ExecuteScriptHelper(boost::beast::http::request<boost::beas

std::ostringstream msgbuf;

msgbuf << di.Path << ": " << lsf.Lines[di.Path] << "\n"
msgbuf << di.Path << ": " << lsf->Lines[di.Path] << "\n"
<< String(di.Path.GetLength() + 2, ' ')
<< String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n"
<< ex.what() << "\n";
Expand Down Expand Up @@ -190,16 +200,16 @@ bool ConsoleHandler::AutocompleteScriptHelper(boost::beast::http::request<boost:

EnsureFrameCleanupTimer();

ApiScriptFrame& lsf = l_ApiScriptFrames[session];
lsf.Seen = Utility::GetTime();
auto lsf = GetOrCreateScriptFrame(session);
lsf->Seen = Utility::GetTime();

if (!lsf.Locals)
lsf.Locals = new Dictionary();
if (!lsf->Locals)
lsf->Locals = new Dictionary();


ScriptFrame frame(true);
frame.Locals = lsf.Locals;
frame.Self = lsf.Locals;
frame.Locals = lsf->Locals;
frame.Self = lsf->Locals;
frame.Sandboxed = sandboxed;

Dictionary::Ptr result1 = new Dictionary({
Expand Down
Loading