Do not expose secret keys in global settings

This commit is contained in:
Raphael Michel
2020-04-29 11:25:22 +02:00
parent 5c62f2b852
commit ee1928aeed
3 changed files with 43 additions and 4 deletions

View File

@@ -48,6 +48,9 @@ class I18nInlineFormSet(i18nfield.forms.I18nInlineFormSet):
super().__init__(*args, **kwargs)
SECRET_REDACTED = '*****'
class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
auto_fields = []
@@ -73,6 +76,12 @@ class SettingsForm(i18nfield.forms.I18nFormMixin, HierarkeyForm):
if isinstance(f, (RelativeDateTimeField, RelativeDateField)):
f.set_event(self.obj)
def save(self):
for k, v in self.cleaned_data.items():
if isinstance(self.fields[k], SecretKeySettingsField) and self.cleaned_data[k] == SECRET_REDACTED:
self.cleaned_data[k] = self.initial[k]
return super().save()
def get_new_filename(self, name: str) -> str:
from pretix.base.models import Event
@@ -111,3 +120,32 @@ class SafeSessionWizardView(SessionWizardView):
}
)
return context
class SecretKeySettingsWidget(forms.TextInput):
def __init__(self, attrs=None):
if attrs is None:
attrs = {}
attrs.update({
'autocomplete': 'new-password' # see https://bugs.chromium.org/p/chromium/issues/detail?id=370363#c7
})
super().__init__(attrs)
def get_context(self, name, value, attrs):
if value:
value = SECRET_REDACTED
return super().get_context(name, value, attrs)
class SecretKeySettingsField(forms.CharField):
widget = SecretKeySettingsWidget
def has_changed(self, initial, data):
if data == SECRET_REDACTED:
return False
return super().has_changed(initial, data)
def run_validators(self, value):
if value == SECRET_REDACTED:
return
return super().run_validators(value)