trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: fix clean_ methods not returning values

This commit is contained in:
Jens Langhammer 2020-05-20 16:10:12 +02:00
parent 4377d1e86e
commit c1a72a0474
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
passbook/crypto/forms.py
View File

@ -20,13 +20,14 @@ class CertificateKeyPairForm(forms.ModelForm):
) )
except ValueError: except ValueError:
raise forms.ValidationError("Unable to load certificate.") raise forms.ValidationError("Unable to load certificate.")
return certificate_data
def clean_key_data(self): def clean_key_data(self):
"""Verify that input is a valid PEM RSA Key""" """Verify that input is a valid PEM RSA Key"""
key_data = self.cleaned_data["key_data"] key_data = self.cleaned_data["key_data"]
# Since this field is optional, data can be empty. # Since this field is optional, data can be empty.
if key_data == "": if key_data == "":
return return key_data
try: try:
load_pem_private_key( load_pem_private_key(
str.encode("\n".join([x.strip() for x in key_data.split("\n")])), str.encode("\n".join([x.strip() for x in key_data.split("\n")])),
@ -36,6 +37,7 @@ class CertificateKeyPairForm(forms.ModelForm):
load_pem_x509_certificate(key_data.encode("utf-8"), default_backend()) load_pem_x509_certificate(key_data.encode("utf-8"), default_backend())
except ValueError: except ValueError:
raise forms.ValidationError("Unable to load private key.") raise forms.ValidationError("Unable to load private key.")
return key_data
class Meta: class Meta: