Skip to content
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.

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

Make CAPTCHA field always required #6301

Merged
merged 1 commit into from Apr 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions indico/modules/core/captcha.py
Expand Up @@ -13,6 +13,7 @@
from flask import session
from marshmallow import ValidationError, fields
from wtforms.fields import StringField
from wtforms.validators import DataRequired
from wtforms.validators import ValidationError as WTFValidationError

from indico.core.plugins import plugin_engine
Expand Down Expand Up @@ -59,8 +60,11 @@ class WTFCaptchaField(StringField):

widget = JinjaWidget('forms/captcha_widget.html', single_kwargs=True)

def __init__(self, label=None, *args, **kwargs):
super().__init__(label or _('CAPTCHA'), *args, **kwargs)
def __init__(self, label=None, validators=None, *args, **kwargs):
validators = validators or []
if not any(isinstance(x, DataRequired) for x in validators):
validators.append(DataRequired())
super().__init__(label or _('CAPTCHA'), validators, *args, **kwargs)

@property
def captcha_settings(self):
Expand Down