Commit b0dd728b authored by joseccnet's avatar joseccnet Committed by Francesco Poldi

added support for http proxy (#325)

* added support for http proxy

Added support for http proxy. Tested and working:

twint --search "twint" --since 2019-01-02 --proxy-type http --proxy-host 182.160.119.254 --proxy-port 56229

* added support for http proxy

added support for http proxy. fix int to str cast.

* Removed comment

Here the comment for reference: aiohttp no works with HTTPS proxy, only HTTP. Ref https://github.com/aio-libs/aiohttp/issues/845
parent 8f9bef6a
......@@ -16,6 +16,7 @@ from .user import inf
#import logging
httpproxy = None
def get_connector(config):
_connector = None
......@@ -31,8 +32,12 @@ def get_connector(config):
_type = SocksVer.SOCKS5
elif config.Proxy_type.lower() == "socks4":
_type = SocksVer.SOCKS4
elif config.Proxy_type.lower() == "http":
global httpproxy
httpproxy = "http://" + config.Proxy_host + ":" + str(config.Proxy_port)
return _connector
else:
print("Error: Proxy types allowed are: socks5 and socks4.")
print("Error: Proxy types allowed are: http, socks5 and socks4. No https.")
sys.exit(1)
_connector = SocksConnector(
socks_ver=_type,
......@@ -109,7 +114,7 @@ async def Request(url, connector=None, params=[], headers=[]):
async def Response(session, url, params=[]):
#loggin.info("[<] " + str(datetime.now()) + ':: get+Response')
with timeout(30):
async with session.get(url, ssl=False, params=params) as response:
async with session.get(url, ssl=False, params=params, proxy=httpproxy) as response:
return await response.text()
async def RandomUserAgent():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment