mirror of
https://github.com/jwinterm/modoboa.git
synced 2026-10-17 05:41:25 +02:00
Removed obsolete secret key.
This commit is contained in:
@@ -72,13 +72,6 @@ class GeneralParametersForm(param_forms.AdminParametersForm):
|
||||
widget=forms.TextInput(attrs={"class": "form-control"})
|
||||
)
|
||||
|
||||
secret_key = forms.CharField(
|
||||
label=ugettext_lazy("Secret key"),
|
||||
initial=random_key(),
|
||||
help_text=ugettext_lazy("Key used to encrypt/decrypt passwords"),
|
||||
widget=forms.TextInput(attrs={"class": "form-control"})
|
||||
)
|
||||
|
||||
default_password = forms.CharField(
|
||||
label=ugettext_lazy("Default password"),
|
||||
initial="password",
|
||||
@@ -348,13 +341,6 @@ class GeneralParametersForm(param_forms.AdminParametersForm):
|
||||
super(GeneralParametersForm, self).__init__(*args, **kwargs)
|
||||
self.fields["default_top_redirection"].choices = enabled_applications()
|
||||
|
||||
def clean_secret_key(self):
|
||||
if len(self.cleaned_data["secret_key"]) not in [16, 24, 32]:
|
||||
raise forms.ValidationError(
|
||||
_("Key must be either 16, 24, or 32 bytes long")
|
||||
)
|
||||
return self.cleaned_data["secret_key"]
|
||||
|
||||
def clean_ldap_user_dn_template(self):
|
||||
tpl = self.cleaned_data["ldap_user_dn_template"]
|
||||
try:
|
||||
|
||||
@@ -49,14 +49,6 @@ class Command(BaseCommand):
|
||||
models.ObjectAccess.objects.create(
|
||||
user=admin, content_object=admin, is_owner=True)
|
||||
|
||||
lc = models.LocalConfig.objects.first()
|
||||
condition = (
|
||||
"core" not in lc._parameters or
|
||||
"secret_key" not in lc._parameters["core"])
|
||||
if condition:
|
||||
lc.parameters.set_value("secret_key", random_key())
|
||||
lc.save()
|
||||
|
||||
groups = list(constants.PERMISSIONS.keys())
|
||||
for groupname in groups:
|
||||
group, created = Group.objects.get_or_create(name=groupname)
|
||||
|
||||
@@ -58,13 +58,6 @@ class ManagementCommandsTestCase(TestCase):
|
||||
self.assertTrue(
|
||||
self.client.login(username="modoadmin", password="password"))
|
||||
|
||||
def test_set_secret_key(self):
|
||||
"""Use dedicated option."""
|
||||
management.call_command("load_initial_data")
|
||||
lc = models.LocalConfig.objects.first()
|
||||
self.assertIn("core", lc._parameters)
|
||||
self.assertIn("secret_key", lc._parameters["core"])
|
||||
|
||||
def test_clean_logs(self):
|
||||
"""Run cleanlogs command."""
|
||||
log1 = factories.LogFactory()
|
||||
|
||||
Reference in New Issue
Block a user