Use evaluateSslExceptionHandler() when constructing OpenSearchSecureSettingsFactory (opensearch-project#4725)

reta · tmanninger · commit b668f514d0b3 · 2024-09-24T10:05:02.000+02:00
Signed-off-by: Andriy Redko &lt;andriy.redko@aiven.io&gt;
Signed-off-by: tmanninger &lt;t.manninger@ixolit.com&gt;
diff --git a/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java b/src/main/java/org/opensearch/security/OpenSearchSecurityPlugin.java
@@ -2122,7 +2122,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
`@@ -2122,7 +2122,7 @@ public PluginSubject getPluginSubject(Plugin plugin) {`
`2122`	`2122`
`2123`	`2123`	`@Override`
`2124`	`2124`	`public Optional<SecureSettingsFactory> getSecureSettingFactory(Settings settings) {`
`2125`		`- return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, sslExceptionHandler, securityRestHandler));`
	`2125`	`+ return Optional.of(new OpenSearchSecureSettingsFactory(threadPool, sks, evaluateSslExceptionHandler(), securityRestHandler));`
`2126`	`2126`	`}`
`2127`	`2127`
`2128`	`2128`	`@SuppressWarnings("removal")`