From: Alexander A. Klimov <alexander.klimov@icinga.com>
Date: Tue, 16 Apr 2019 13:53:44 +0000 (+0200)
Subject: FilterUtility::EvaluateFilter(): ensure not to modify the global namespace
X-Git-Tag: v2.10.5~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=967616d88ef485658c0c551c534953c8ca4cef7f;p=icinga2

FilterUtility::EvaluateFilter(): ensure not to modify the global namespace

(cherry picked from commit bdadb53940f1187d60a4679675af164dbb63f37c)
---

diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index 8bcebfafb..8a7605ad8 100644
--- a/lib/remote/filterutility.cpp
+++ b/lib/remote/filterutility.cpp
@@ -106,6 +106,8 @@ bool FilterUtility::EvaluateFilter(ScriptFrame& frame, Expression *filter,
 		ASSERT(frame.Self.IsObjectType<Namespace>());
 
 		frameNS = frame.Self;
+
+		ASSERT(frameNS != ScriptGlobal::GetGlobals());
 	}
 
 	frameNS->Set("obj", target);
@@ -256,9 +258,9 @@ std::vector<Value> FilterUtility::GetFilterTargets(const QueryDescription& qd, c
 		if (qd.Types.find(type) == qd.Types.end())
 			BOOST_THROW_EXCEPTION(std::invalid_argument("Invalid type specified for this query."));
 
-		ScriptFrame frame(true);
-		frame.Sandboxed = true;
 		Namespace::Ptr frameNS = new Namespace();
+		ScriptFrame frame(true, frameNS);
+		frame.Sandboxed = true;
 
 		if (query->Contains("filter")) {
 			String filter = HttpUtility::GetLastParameter(query, "filter");
@@ -272,8 +274,6 @@ std::vector<Value> FilterUtility::GetFilterTargets(const QueryDescription& qd, c
 				}
 			}
 
-			frame.Self = frameNS;
-
 			provider->FindTargets(type, std::bind(&FilteredAddTarget,
 				std::ref(permissionFrame), permissionFilter,
 				std::ref(frame), &*ufilter, std::ref(result), variableName, _1));