Use evaluateSslExceptionHandler() when constructing OpenSearchSecureSettingsFactory (#4725)

github-actions[bot] · github-actions[bot] · commit 4c983d54996e · 2024-09-10T14:54:14.000Z
Signed-off-by: Andriy Redko <andriy.redko@aiven.io> (cherry picked from commit 014c8de) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -2120,7 +2120,7 @@ public PluginSubject getPluginSubject(Plugin plugin) {
 
     @Override
     public Optional<SecureSettingsFactory> getSecureSettingFactory(Settings settings) {
-        return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, sslExceptionHandler, securityRestHandler));
+        return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, evaluateSslExceptionHandler(), securityRestHandler));
     }
 
     @SuppressWarnings("removal")

Original file line number	Diff line number	Diff line change
`@@ -2120,7 +2120,7 @@ public PluginSubject getPluginSubject(Plugin plugin) {`
`2120`	`2120`
`2121`	`2121`	`@Override`
`2122`	`2122`	`public Optional<SecureSettingsFactory> getSecureSettingFactory(Settings settings) {`
`2123`		`- return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, sslExceptionHandler, securityRestHandler));`
	`2123`	`+ return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, evaluateSslExceptionHandler(), securityRestHandler));`
`2124`	`2124`	`}`
`2125`	`2125`
`2126`	`2126`	`@SuppressWarnings("removal")`