Skip to content

added proxy support #19

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
ivan140 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added proxy support #19

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
ced7269
added useProxy functionality. Works only with HTTP proxies and CTBOT_…
Feb 23, 2019
3acb9d3
Merge branch 'master' into proxy_support
shurillu Feb 25, 2019
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
3 changes: 3 additions & 0 deletions keywords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ CTBotInlineKeyboard KEYWORD1
setIP KEYWORD2
wifiConnect KEYWORD2
setTelegramToken KEYWORD2
setTelegramIP KEYWORD2
setTelegramPort KEYWORD2
useDNS KEYWORD2
useProxy KEYWORD2
enableUTF8Encoding KEYWORD2
setMaxConnectionRetries KEYWORD2
setStatusPin KEYWORD2
Expand Down
33 changes: 27 additions & 6 deletions src/CTBot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#include "CTBot.h"

#define TELEGRAM_URL "api.telegram.org"
#define TELEGRAM_IP "149.154.167.198"
#define TELEGRAM_PORT 443
// get fingerprints from https://www.grc.com/fingerprints.htm
const uint8_t fingerprint[20] = { 0xBB, 0xDC, 0x45, 0x2A, 0x07, 0xE3, 0x4A, 0x71, 0x33, 0x40, 0x32, 0xDA, 0xBE, 0x81, 0xF7, 0x72, 0x6F, 0x4A, 0x2B, 0x6B };

Expand Down Expand Up @@ -107,6 +105,8 @@ CTBot::CTBot() {
m_useDNS = false; // use static IP for Telegram Server
m_UTF8Encoding = false; // no UTF8 encoded string conversion
setFingerprint(fingerprint); // set the default fingerprint
TELEGRAM_IP = "149.154.167.198";
TELEGRAM_PORT = 443;
}

CTBot::~CTBot() {
Expand All @@ -115,7 +115,7 @@ CTBot::~CTBot() {
String CTBot::sendCommand(String command, String parameters)
{
#if CTBOT_USE_FINGERPRINT == 0
WiFiClientSecure telegramServer;
WiFiClient telegramServer;
#else
BearSSL::WiFiClientSecure telegramServer;
telegramServer.setFingerprint(m_fingerprint);
Expand Down Expand Up @@ -157,10 +157,13 @@ String CTBot::sendCommand(String command, String parameters)
digitalWrite(m_statusPin, !digitalRead(m_statusPin)); // set pin to the opposite state

// must filter command + parameters from escape sequences and spaces
String URL = "GET /bot" + m_token + (String)"/" + toURL(command + parameters);

String URL = "GET https://api.telegram.org/bot" + m_token + (String)"/" + toURL(command + parameters);
// send the HTTP request
telegramServer.println(URL);
String request = URL + String(" HTTP/1.1\r\n") +
"Host: " + TELEGRAM_URL + String("\r\n") +
String("Accept-Encoding: identity\r\n") +
String("\r\n");
telegramServer.print(request);

if (m_statusPin != CTBOT_DISABLE_STATUS_PIN)
digitalWrite(m_statusPin, !digitalRead(m_statusPin)); // set pin to the opposite state
Expand All @@ -170,6 +173,11 @@ String CTBot::sendCommand(String command, String parameters)
bool skipCounter = false; // for filtering curly bracket inside a text message
curlyCounter = -1;
response = "";

while (telegramServer.connected()) {
if(telegramServer.readStringUntil('\n')=="\r")
break;
}

while (telegramServer.connected()) {
while (telegramServer.available()) {
Expand Down Expand Up @@ -508,6 +516,19 @@ void CTBot::setFingerprint(const uint8_t * newFingerprint)
m_fingerprint[i] = newFingerprint[i];
}

void CTBot::setTelegramIP(String IP){
TELEGRAM_IP = IP;
}

void CTBot::setTelegramPort(int port){
TELEGRAM_PORT = port;
}

void CTBot::useProxy(String IP, int port){
setTelegramIP(IP);
setTelegramPort(port);
}

bool CTBot::setIP(String ip, String gateway, String subnetMask, String dns1, String dns2){
IPAddress IP, SN, GW, DNS1, DNS2;

Expand Down
16 changes: 16 additions & 0 deletions src/CTBot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,19 @@ class CTBot
// params:
// newFingerprint: the array of 20 bytes that contains the new fingerprint
void setFingerprint(const uint8_t *newFingerprint);

void setTelegramIP(String IP);

void setTelegramPort(int port);

// sets a proxy which should be used in case connection to api.telegram.org fails
// no SSL so no encryption of the requests!!!
// CTBOT_USE_FINGERPRINT must be 0
//params:
// IP: IP of a HTTP proxy-server. If the response time of the server is too long
// the requests will timeout
// port: port of the proxy-server
void useProxy(String IP, int port);

private:
uint8_t m_wifiConnectionTries;
Expand All @@ -135,6 +148,9 @@ class CTBot
bool m_UTF8Encoding;
bool m_needInsecureFlag;
uint8_t m_fingerprint[20];

String TELEGRAM_IP;
uint16_t TELEGRAM_PORT;

// send data to the serial port. It work only if the CTBOT_DEBUG_MODE is enabled.
// params
Expand Down