Skip to content

Commit f25186d

Browse files
author
psainics
committed
Set correct ssl factory when using OAUTH
1 parent 769b221 commit f25186d

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ public static AccessToken getAccessToken(BaseHttpConfig config) throws IOExcepti
8383
// get accessToken from service account
8484
return OAuthUtil.getAccessTokenByServiceAccount(config);
8585
case OAUTH2:
86+
if (config instanceof BaseHttpSourceConfig) {
87+
try (CloseableHttpClient client = HttpClients.custom()
88+
.setSSLSocketFactory(new SSLConnectionSocketFactoryCreator((BaseHttpSourceConfig) config).create())
89+
.build()) {
90+
return getAccessToken(client, config);
91+
}
92+
}
8693
try (CloseableHttpClient client = HttpClients.createDefault()) {
8794
return getAccessToken(client, config);
8895
}

src/main/java/io/cdap/plugin/http/source/batch/HttpBatchSourceConfig.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.cdap.plugin.http.common.http.AuthType;
2222
import io.cdap.plugin.http.common.http.HttpClient;
2323
import io.cdap.plugin.http.common.http.OAuthUtil;
24+
import io.cdap.plugin.http.common.http.SSLConnectionSocketFactoryCreator;
2425
import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
2526
import org.apache.http.HttpEntity;
2627
import org.apache.http.HttpHost;
@@ -70,7 +71,8 @@ private void validateOAuth2Credentials(FailureCollector collector) {
7071
!containsMacro(PROPERTY_PROXY_PASSWORD) && !containsMacro(PROPERTY_PROXY_USERNAME) &&
7172
!containsMacro(PROPERTY_PROXY_URL) && !containsMacro(PROPERTY_OAUTH2_CLIENT_AUTHENTICATION) &&
7273
!containsMacro(PROPERTY_OAUTH2_GRANT_TYPE)) {
73-
HttpClientBuilder httpclientBuilder = HttpClients.custom();
74+
HttpClientBuilder httpclientBuilder = HttpClients.custom()
75+
.setSSLSocketFactory(new SSLConnectionSocketFactoryCreator(this).create());
7476
if (!Strings.isNullOrEmpty(getProxyUrl())) {
7577
HttpHost proxyHost = HttpHost.create(getProxyUrl());
7678
if (!Strings.isNullOrEmpty(getProxyUsername()) && !Strings.isNullOrEmpty(getProxyPassword())) {

0 commit comments

Comments
 (0)