From 378c8aaddc0b342684e6578b070a7ab2dd8b90c6 Mon Sep 17 00:00:00 2001 From: "Vyacheslav N. Boyko" Date: Mon, 16 Apr 2018 17:58:51 +0300 Subject: [PATCH] implemented authorization via http proxy --- .../telegrambots/bots/DefaultAbsSender.java | 46 +++++++++++++++++-- .../telegrambots/bots/DefaultBotOptions.java | 21 +++++++++ .../bots/TelegramLongPollingBot.java | 2 +- .../telegrambots/bots/TelegramWebhookBot.java | 2 +- .../updatesreceivers/DefaultBotSession.java | 30 ++++++++++-- 5 files changed, 89 insertions(+), 12 deletions(-) diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java index 52d88b08..eff31bb5 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java @@ -13,6 +13,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.ProxyAuthenticationStrategy; import org.apache.http.util.EntityUtils; import org.telegram.telegrambots.api.methods.BotApiMethod; import org.telegram.telegrambots.api.methods.groupadministration.SetChatPhoto; @@ -61,11 +62,23 @@ public abstract class DefaultAbsSender extends AbsSender { super(); this.exe = Executors.newFixedThreadPool(options.getMaxThreads()); this.options = options; - httpclient = HttpClientBuilder.create() - .setSSLHostnameVerifier(new NoopHostnameVerifier()) - .setConnectionTimeToLive(70, TimeUnit.SECONDS) - .setMaxConnTotal(100) - .build(); + + if (options.getCredentialsProvider() != null) { + httpclient = HttpClientBuilder.create() + .setProxy(options.getHttpProxy()) + .setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy()) + .setDefaultCredentialsProvider(options.getCredentialsProvider()) + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } else { + httpclient = HttpClientBuilder.create() + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } requestConfig = options.getRequestConfig(); @@ -87,6 +100,29 @@ public abstract class DefaultAbsSender extends AbsSender { return options; } + protected CloseableHttpClient createHttpClient() { + CloseableHttpClient localClient = null; + + if (options.getCredentialsProvider() != null) { + localClient = HttpClientBuilder.create() + .setProxy(options.getHttpProxy()) + .setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy()) + .setDefaultCredentialsProvider(options.getCredentialsProvider()) + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } else { + localClient = HttpClientBuilder.create() + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } + + return localClient; + } + // Send Requests public final java.io.File downloadFile(String filePath) throws TelegramApiException { diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java index b8e115cf..f965ab91 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java @@ -1,5 +1,7 @@ package org.telegram.telegrambots.bots; +import org.apache.http.HttpHost; +import org.apache.http.client.CredentialsProvider; import org.apache.http.client.config.RequestConfig; import org.telegram.telegrambots.ApiConstants; import org.telegram.telegrambots.generics.BotOptions; @@ -21,6 +23,9 @@ public class DefaultBotOptions implements BotOptions { private String baseUrl; private List allowedUpdates; + private CredentialsProvider credentialsProvider; + private HttpHost httpProxy; + public DefaultBotOptions() { maxThreads = 1; baseUrl = ApiConstants.BASE_URL; @@ -82,4 +87,20 @@ public class DefaultBotOptions implements BotOptions { public void setExponentialBackOff(ExponentialBackOff exponentialBackOff) { this.exponentialBackOff = exponentialBackOff; } + + public CredentialsProvider getCredentialsProvider() { + return credentialsProvider; + } + + public void setCredentialsProvider(CredentialsProvider credentialsProvider) { + this.credentialsProvider = credentialsProvider; + } + + public HttpHost getHttpProxy() { + return httpProxy; + } + + public void setHttpProxy(HttpHost httpProxy) { + this.httpProxy = httpProxy; + } } diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java index 8a3508de..4550a903 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java @@ -36,7 +36,7 @@ public abstract class TelegramLongPollingBot extends DefaultAbsSender implements @Override public void clearWebhook() throws TelegramApiRequestException { - try (CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build()) { + try (CloseableHttpClient httpclient = this.createHttpClient()) { String url = getOptions().getBaseUrl() + getBotToken() + "/" + SetWebhook.PATH; HttpGet httpGet = new HttpGet(url); httpGet.setConfig(getOptions().getRequestConfig()); diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java index bc07b96f..9c345134 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java @@ -44,7 +44,7 @@ public abstract class TelegramWebhookBot extends DefaultAbsSender implements Web @Override public void setWebhook(String url, String publicCertificatePath) throws TelegramApiRequestException { - try (CloseableHttpClient httpclient = HttpClientBuilder.create().setSSLHostnameVerifier(new NoopHostnameVerifier()).build()) { + try (CloseableHttpClient httpclient = this.createHttpClient()) { String requestUrl = getBaseUrl() + SetWebhook.PATH; HttpPost httppost = new HttpPost(requestUrl); diff --git a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java index 2e310b33..190cf136 100644 --- a/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java +++ b/telegrambots/src/main/java/org/telegram/telegrambots/updatesreceivers/DefaultBotSession.java @@ -12,6 +12,7 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.ProxyAuthenticationStrategy; import org.apache.http.util.EntityUtils; import org.json.JSONException; import org.telegram.telegrambots.ApiConstants; @@ -145,13 +146,32 @@ public class DefaultBotSession implements BotSession { this.lock = lock; } + protected CloseableHttpClient createHttpClient() { + CloseableHttpClient localClient = null; + + if (options.getCredentialsProvider() != null) { + localClient = HttpClientBuilder.create() + .setProxy(options.getHttpProxy()) + .setProxyAuthenticationStrategy(new ProxyAuthenticationStrategy()) + .setDefaultCredentialsProvider(options.getCredentialsProvider()) + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } else { + localClient = HttpClientBuilder.create() + .setSSLHostnameVerifier(new NoopHostnameVerifier()) + .setConnectionTimeToLive(70, TimeUnit.SECONDS) + .setMaxConnTotal(100) + .build(); + } + + return localClient; + } + @Override public synchronized void start() { - httpclient = HttpClientBuilder.create() - .setSSLHostnameVerifier(new NoopHostnameVerifier()) - .setConnectionTimeToLive(70, TimeUnit.SECONDS) - .setMaxConnTotal(100) - .build(); + httpclient = createHttpClient(); requestConfig = options.getRequestConfig(); exponentialBackOff = options.getExponentialBackOff();