Skip to content

[🍒]Bump HTTP Plugins version to 1.5.2-SNAPSHOT & Auth fix #207

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

Open
harishhk107 wants to merge 2 commits into
base: release/1.5
Choose a base branch
from
+24 −6
Open

[🍒]Bump HTTP Plugins version to 1.5.2-SNAPSHOT & Auth fix #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2381f07
Added a fix for OAuth2 Proxy Routing
harishhk107 Apr 28, 2026
4786c7a
Bump HTTP Plugins version and update pom.xml
harishhk107 Apr 28, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<name>HTTP Plugins</name>
<groupId>io.cdap</groupId>
<artifactId>http-plugins</artifactId>
<version>1.5.1</version>
<version>1.5.2-SNAPSHOT</version>

<licenses>
<license>
Expand Down
28 changes: 23 additions & 5 deletions src/main/java/io/cdap/plugin/http/common/http/OAuthUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,17 @@
import io.cdap.plugin.http.common.OAuth2GrantType;
import io.cdap.plugin.http.common.pagination.page.JSONUtil;
import io.cdap.plugin.http.source.common.BaseHttpSourceConfig;
import org.apache.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.utils.URIBuilder;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicHeader;
import org.apache.http.message.BasicNameValuePair;
Expand Down Expand Up @@ -83,14 +89,26 @@ public static AccessToken getAccessToken(BaseHttpConfig config) throws IOExcepti
// get accessToken from service account
return OAuthUtil.getAccessTokenByServiceAccount(config);
case OAUTH2:
HttpClientBuilder httpClientBuilder = HttpClients.custom();

if (config instanceof BaseHttpSourceConfig) {
try (CloseableHttpClient client = HttpClients.custom()
.setSSLSocketFactory(new SSLConnectionSocketFactoryCreator((BaseHttpSourceConfig) config).create())
.build()) {
return getAccessToken(client, config);
httpClientBuilder.setSSLSocketFactory(
new SSLConnectionSocketFactoryCreator((BaseHttpSourceConfig) config).create()
);
}
// Apply Proxy settings if they exist
if (!Strings.isNullOrEmpty(config.getProxyUrl())) {
HttpHost proxyHost = HttpHost.create(config.getProxyUrl());

if (!Strings.isNullOrEmpty(config.getProxyUsername()) && !Strings.isNullOrEmpty(config.getProxyPassword())) {
CredentialsProvider credsProvider = new BasicCredentialsProvider();
credsProvider.setCredentials(new AuthScope(proxyHost),
new UsernamePasswordCredentials(config.getProxyUsername(), config.getProxyPassword()));
httpClientBuilder.setDefaultCredentialsProvider(credsProvider);
}
httpClientBuilder.setProxy(proxyHost);
}
try (CloseableHttpClient client = HttpClients.createDefault()) {
try (CloseableHttpClient client = httpClientBuilder.build()) {
return getAccessToken(client, config);
}
}
Expand Down
Loading