Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions reddwarf/data_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import csv
from io import StringIO
from reddwarf.models import Vote, Statement
from reddwarf.helpers import CachedLimiterSession, CloudflareBypassHTTPAdapter
from reddwarf.helpers import CachedLimiterSession

ua = UserAgent()

Expand Down Expand Up @@ -537,8 +537,6 @@ def init_http_client(self):
)
else:
self.session = LimiterSession(per_second=5)
adapter = CloudflareBypassHTTPAdapter()
self.session.mount(self.polis_instance_url, adapter)
self.session.headers = {
"User-Agent": ua.random,
}
Expand Down
30 changes: 1 addition & 29 deletions reddwarf/helpers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from urllib3.util import ssl_
from requests import Session
from requests.adapters import HTTPAdapter
from requests_cache import CacheMixin
from requests_ratelimiter import LimiterMixin

Expand All @@ -10,30 +8,4 @@ class CachedLimiterSession(CacheMixin, LimiterMixin, Session):
LimiterSession and CachedSession.

See: See: https://requests-cache.readthedocs.io/en/stable/user_guide/compatibility.html#requests-ratelimiter
"""

class CloudflareBypassHTTPAdapter(HTTPAdapter):
"""
A TransportAdapter that forces TLSv1.3 in Requests, so that Cloudflare doesn't flag us.

Source: https://lukasa.co.uk/2017/02/Configuring_TLS_With_Requests/
"""

def init_patched_ssl_context(self):
context = ssl_.create_urllib3_context()
context.load_default_certs()
# Only available in Python 3.7
if hasattr(ssl_, "TLSVersion"):
context.minimum_version = ssl_.TLSVersion.TLSv1_3
else:
context.options |= ssl_.OP_NO_TLSv1_2

return context

def init_poolmanager(self, *args, **kwargs):
kwargs['ssl_context'] = self.init_patched_ssl_context()
return super(CloudflareBypassHTTPAdapter, self).init_poolmanager(*args, **kwargs)

def proxy_manager_for(self, *args, **kwargs):
kwargs['ssl_context'] = self.init_patched_ssl_context()
return super(CloudflareBypassHTTPAdapter, self).proxy_manager_for(*args, **kwargs)
"""
Loading