Skip to content

Commit

Permalink
[fix][admin] Add SNI header when tlsHostnameVerification is not enabl…
Browse files Browse the repository at this point in the history
…ed (apache#17543)
  • Loading branch information
fantapsody authored Sep 14, 2022
1 parent 8e0ae80 commit 99b52eb
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.apache.pulsar.client.api.KeyStoreParams;
import org.apache.pulsar.client.impl.PulsarServiceNameResolver;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.util.WithSNISslEngineFactory;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.SecurityUtility;
import org.apache.pulsar.common.util.keystoretls.KeyStoreSSLContext;
Expand Down Expand Up @@ -171,6 +172,10 @@ public boolean keepAlive(InetSocketAddress remoteAddress, Request ahcRequest,
conf.getTlsProtocols());
}
confBuilder.setSslContext(sslCtx);
if (!conf.isTlsHostnameVerificationEnable()) {
confBuilder.setSslEngineFactory(new WithSNISslEngineFactory(serviceNameResolver
.resolveHostUri().getHost()));
}
}
}
confBuilder.setDisableHttpsEndpointIdentificationAlgorithm(!conf.isTlsHostnameVerificationEnable());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.PulsarClientException.NotFoundException;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.util.WithSNISslEngineFactory;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.common.util.SecurityUtility;
import org.apache.pulsar.common.util.keystoretls.KeyStoreSSLContext;
Expand Down Expand Up @@ -140,6 +141,10 @@ public boolean keepAlive(InetSocketAddress remoteAddress, Request ahcRequest,
conf.getTlsProtocols());
}
confBuilder.setSslContext(sslCtx);
if (!conf.isTlsHostnameVerificationEnable()) {
confBuilder.setSslEngineFactory(new WithSNISslEngineFactory(serviceNameResolver
.resolveHostUri().getHost()));
}
}

confBuilder.setUseInsecureTrustManager(conf.isTlsAllowInsecureConnection());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.pulsar.client.util;

import java.util.Collections;
import javax.net.ssl.SNIHostName;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.netty.ssl.DefaultSslEngineFactory;

public class WithSNISslEngineFactory extends DefaultSslEngineFactory {
private final String host;

public WithSNISslEngineFactory(String host) {
this.host = host;
}

@Override
protected void configureSslEngine(SSLEngine sslEngine, AsyncHttpClientConfig config) {
super.configureSslEngine(sslEngine, config);
SSLParameters params = sslEngine.getSSLParameters();
params.setServerNames(Collections.singletonList(new SNIHostName(host)));
sslEngine.setSSLParameters(params);
}
}

0 comments on commit 99b52eb

Please sign in to comment.