Skip to content

Commit ffb54ec

Browse files
authored
Bug fix settings (#85)
* settings * captcha keys * updated settings
1 parent 53e9225 commit ffb54ec

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

forums/settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
load_dotenv()
1515
import os
1616

17+
1718
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1819
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
1920

@@ -23,6 +24,7 @@
2324
RECAPTCHA_SITE_KEY = os.getenv("RECAPTCHA_SITE_KEY")
2425
RECAPTCHA_SECRET_KEY = os.getenv("RECAPTCHA_SECRET_KEY")
2526

27+
2628
RECAPTCHA_SITE_KEY_v3 = os.getenv("RECAPTCHA_SITE_KEY_v3")
2729
RECAPTCHA_SECRET_KEY_v3 = os.getenv("RECAPTCHA_SECRET_KEY_v3")
2830

website/middleware.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.conf import settings
22
from django.shortcuts import render
3+
from forums.settings import RECAPTCHA_SITE_KEY_v3
34

45
class FilterCaptchaGateMiddleware(object):
56
"""
@@ -15,8 +16,9 @@ def __init__(self, get_response=None):
1516
self.get_response = get_response
1617

1718
def __call__(self, request):
19+
1820
path = request.path
19-
21+
2022
# Only apply to filter endpoints
2123
if path.startswith('/filter/'):
2224

@@ -39,7 +41,7 @@ def __call__(self, request):
3941
if needs_verification:
4042
context = {
4143
'next_url': request.get_full_path(),
42-
'site_key': settings.RECAPTCHA_SITE_KEY_v3
44+
'site_key': RECAPTCHA_SITE_KEY_v3
4345
}
4446
return render(request, 'website/templates/filter_verify.html',context)
4547

website/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from forums.views import user_logout
2424
from website.permissions import is_administrator, is_forumsadmin
2525

26+
from forums.settings import RECAPTCHA_SECRET_KEY_v3
2627
User = get_user_model()
2728

2829
HOME_CACHE_TIMEOUT = 3600
@@ -1102,7 +1103,7 @@ def verify_filter_access(request):
11021103
return HttpResponseForbidden("Missing captcha token")
11031104

11041105
try:
1105-
data = {'secret': settings.RECAPTCHA_SECRET_KEY_v3, 'response': token}
1106+
data = {'secret': RECAPTCHA_SECRET_KEY_v3, 'response': token}
11061107
resp = requests.post('https://www.google.com/recaptcha/api/siteverify',
11071108
data, timeout=5)
11081109
result = resp.json()

0 commit comments

Comments
 (0)