From 08e94a7f2a2e9faa586ae79e10ea18be968d58b6 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Fri, 17 Apr 2026 16:36:23 +0200 Subject: [PATCH] Fix flaky TbRestApiCallNodeTest via SsrfProtectionValidator ResourceLock TbRestApiCallNodeTest ran concurrently with SsrfSafeAddressResolverGroupTest, which toggles the static SsrfProtectionValidator.enabled flag in its setUp/tearDown. When the flag leaked into the REST test's async HTTP calls, 'localhost' was rejected by SSRF and extra tellFailure invocations broke the Mockito verify count. TbHttpClientTest and SsrfSafeAddressResolverGroupTest already declare @ResourceLock("SsrfProtectionValidator"); apply the same lock to TbRestApiCallNodeTest so all three SSRF-sensitive tests serialize. Fixes #15453 --- .../org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java index 493c5abf8c..cc2daa2421 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java @@ -27,6 +27,7 @@ import org.apache.http.protocol.HttpRequestHandler; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.parallel.ResourceLock; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ValueSource; @@ -70,6 +71,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @ExtendWith(MockitoExtension.class) +@ResourceLock("SsrfProtectionValidator") // to avoid race conditions when modifying SsrfProtectionValidator's static configuration public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest { static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30);