Skip to content

fix(recaptcha): extract token from first list item in clean() #25

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

fix(recaptcha): extract token from first list item in clean() #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5bf9122
fix(recaptcha): extract token from first list item in clean()
SoheilJafari Aug 13, 2025
a554bb1
fix: disable reCAPTCHA only when RECAPTCHA_DISABLE is set to true
SoheilJafari Aug 13, 2025
ffd6324
fix: disable reCAPTCHA only when RECAPTCHA_DISABLE is set to true
SoheilJafari Aug 13, 2025
013077a
fix: disable reCAPTCHA only when RECAPTCHA_DISABLE is set to true
SoheilJafari Aug 13, 2025
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
10 changes: 6 additions & 4 deletions snowpenguin/django/recaptcha3/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

class ReCaptchaField(forms.CharField):
def __init__(self, attrs=None, *args, **kwargs):
if os.environ.get('RECAPTCHA_DISABLE', None) is None:
disable = os.environ.get('RECAPTCHA_DISABLE', '').lower() == 'true'
if not disable:
self._private_key = kwargs.pop('private_key', settings.RECAPTCHA_PRIVATE_KEY)
self._score_threshold = kwargs.pop('score_threshold', settings.RECAPTCHA_SCORE_THRESHOLD)

Expand All @@ -28,13 +29,14 @@ def __init__(self, attrs=None, *args, **kwargs):

def clean(self, values):
# Disable the check (and allow empty field value) if we run in a unittest
if os.environ.get('RECAPTCHA_DISABLE', None) is not None:
if os.environ.get('RECAPTCHA_DISABLE', '').lower() == 'true':
try:
return json.loads(os.environ.get('RECAPTCHA_DISABLE', None))
return {}
except:
return {}

response_token = super(ReCaptchaField, self).clean(values)
super(ReCaptchaField, self).clean(values[0])
response_token = values[0]

try:
r = requests.post(
Expand Down
4 changes: 2 additions & 2 deletions snowpenguin/django/recaptcha3/templatetags/recaptcha3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def recaptcha_execute(public_key=None, action_name=None, custom_callback=None):
def return_empty_context(*args, **kwargs):
return ''


if not os.environ.get('RECAPTCHA_DISABLE', None):
disable = os.environ.get('RECAPTCHA_DISABLE', '').lower() == 'true'
if not disable:
register.inclusion_tag(get_template('snowpenguin/recaptcha/recaptcha_init.html'))(recaptcha_init)
register.inclusion_tag(get_template('snowpenguin/recaptcha/recaptcha_ready.html'))(recaptcha_ready)
register.inclusion_tag(get_template('snowpenguin/recaptcha/recaptcha_execute.html'))(recaptcha_execute)
Expand Down