Skip to content
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

Jump to bottom

Add support for extension_dn #879

Closed
wants to merge 1 commit into from
Closed

Add support for extension_dn #879

Show file tree
Hide file tree
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
13 changes: 13 additions & 0 deletions src/main/java/org/opensearch/sdk/handlers/ExtensionsInitRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
import org.opensearch.discovery.InitializeExtensionResponse;
import org.opensearch.sdk.ExtensionsRunner;
import org.opensearch.sdk.SDKTransportService;
import org.opensearch.sdk.ssl.DefaultSslKeyStore;
import org.opensearch.transport.TransportService;

import java.nio.file.Path;

import static org.opensearch.sdk.ExtensionsRunner.NODE_NAME_SETTING;

/**
Expand Down Expand Up @@ -53,6 +56,8 @@ public ExtensionsInitRequestHandler(ExtensionsRunner extensionsRunner) {
*/
public InitializeExtensionResponse handleExtensionInitRequest(InitializeExtensionRequest extensionInitRequest) {
logger.info("Registering Extension Request received from OpenSearch");
validateDNs(extensionInitRequest);

extensionsRunner.getThreadPool().getThreadContext().putHeader("extension_unique_id", extensionInitRequest.getExtension().getId());
SDKTransportService sdkTransportService = extensionsRunner.getSdkTransportService();
sdkTransportService.setOpensearchNode(extensionInitRequest.getSourceNode());
Expand Down Expand Up @@ -94,4 +99,12 @@ public InitializeExtensionResponse handleExtensionInitRequest(InitializeExtensio
extensionsRunner.getSdkClusterService().getClusterSettings().sendPendingSettingsUpdateConsumers();
}
}

private void validateDNs(InitializeExtensionRequest extensionInitRequest) {
DefaultSslKeyStore sks = new DefaultSslKeyStore(extensionsRunner.getSettings(), Path.of("").toAbsolutePath().resolve("config"));
String distingishedName = extensionInitRequest.getExtension().getDistinguishedNames();
if(!sks.hasValidDNs(distingishedName)) {
throw new IllegalArgumentException("DN: " + distingishedName + " is different then transport certificate DN.");
}
}
}
8 changes: 8 additions & 0 deletions src/main/java/org/opensearch/sdk/ssl/DefaultSslKeyStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.nio.file.Paths;
import java.security.AccessController;
import java.security.NoSuchAlgorithmException;
import java.security.Principal;
import java.security.PrivateKey;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
Expand Down Expand Up @@ -459,6 +460,13 @@ private boolean hasValidDNs(final X509Certificate[] currentX509Certs, final X509
return currentCertDNList.equals(newCertDNList);
}

public boolean hasValidDNs(String dn) {
return Arrays.stream(this.transportCerts)
.map(X509Certificate::getSubjectX500Principal)
.map(Principal::getName)
.anyMatch(dn::equals);
}

/**
* Check if new X509 certs have expiry date after the current X509 certs.
* @param currentX509Certs Array of current X509Certificates.
Expand Down