You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ma...@apache.org on 2022/09/13 22:04:05 UTC
[solr-sandbox] branch crossdc-wip updated: Explicit SSL Config (#36)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch crossdc-wip
in repository https://gitbox.apache.org/repos/asf/solr-sandbox.git
The following commit(s) were added to refs/heads/crossdc-wip by this push:
new 606f0d3 Explicit SSL Config (#36)
606f0d3 is described below
commit 606f0d318e65bdf8076cceb29d9b0aa62fa6c053
Author: Mark Robert Miller <ma...@apache.org>
AuthorDate: Tue Sep 13 17:03:31 2022 -0500
Explicit SSL Config (#36)
---
.../solr/crossdc/common/KafkaCrossDcConf.java | 33 +++++++++++++++++++++-
.../solr/crossdc/SolrAndKafkaReindexTest.java | 4 +--
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
index 85738b9..e7e510f 100644
--- a/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
+++ b/crossdc-commons/src/main/java/org/apache/solr/crossdc/common/KafkaCrossDcConf.java
@@ -16,8 +16,12 @@
*/
package org.apache.solr.crossdc.common;
+import org.apache.kafka.clients.admin.AdminClientConfig;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.common.config.SslConfigs;
+import org.apache.kafka.common.config.internals.BrokerSecurityConfigs;
import java.util.*;
@@ -120,7 +124,34 @@ public class KafkaCrossDcConf extends CrossDcConf {
new ConfigProperty(MAX_PARTITION_FETCH_BYTES, DEFAULT_MAX_PARTITION_FETCH_BYTES),
new ConfigProperty(MAX_POLL_RECORDS, DEFAULT_MAX_POLL_RECORDS),
new ConfigProperty(PORT, DEFAULT_PORT),
- new ConfigProperty(GROUP_ID, DEFAULT_GROUP_ID)
+ new ConfigProperty(GROUP_ID, DEFAULT_GROUP_ID),
+
+ // SSL
+ new ConfigProperty(SslConfigs.SSL_PROTOCOL_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_PROVIDER_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_CIPHER_SUITES_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_ENABLED_PROTOCOLS_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYSTORE_TYPE_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYSTORE_LOCATION_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYSTORE_PASSWORD_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEY_PASSWORD_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYSTORE_KEY_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYSTORE_CERTIFICATE_CHAIN_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_TRUSTSTORE_CERTIFICATES_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_TRUSTSTORE_TYPE_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_TRUSTSTORE_LOCATION_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_TRUSTSTORE_PASSWORD_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_KEYMANAGER_ALGORITHM_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_TRUSTMANAGER_ALGORITHM_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG),
+ new ConfigProperty(SslConfigs.SSL_SECURE_RANDOM_IMPLEMENTATION_CONFIG),
+
+ new ConfigProperty(BrokerSecurityConfigs.SSL_CLIENT_AUTH_CONFIG),
+
+
+ // Admin Client Security
+ new ConfigProperty(AdminClientConfig.SECURITY_PROTOCOL_CONFIG),
+ new ConfigProperty(AdminClientConfig.SECURITY_PROVIDERS_CONFIG)
);
diff --git a/crossdc-producer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaReindexTest.java b/crossdc-producer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaReindexTest.java
index c0037cd..3ee449f 100644
--- a/crossdc-producer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaReindexTest.java
+++ b/crossdc-producer/src/test/java/org/apache/solr/crossdc/SolrAndKafkaReindexTest.java
@@ -140,7 +140,7 @@ import java.util.*;
QueryResponse results = null;
boolean foundUpdates = false;
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < 1000; i++) {
solrCluster2.getSolrClient().commit(COLLECTION);
solrCluster1.getSolrClient().query(COLLECTION, new SolrQuery("*:*"));
results = solrCluster2.getSolrClient().query(COLLECTION, new SolrQuery("*:*"));
@@ -162,7 +162,7 @@ import java.util.*;
addDocs(client, "second");
foundUpdates = false;
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < 1000; i++) {
solrCluster2.getSolrClient().commit(COLLECTION);
solrCluster1.getSolrClient().query(COLLECTION, new SolrQuery("*:*"));
results = solrCluster2.getSolrClient().query(COLLECTION, new SolrQuery("*:*"));