From 81ac9518725d95d7ffcf9cf7ca253a12f468129e Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 22 Mar 2019 10:55:26 +0100 Subject: [PATCH] validate upstream in form --- passbook/app_gw/forms.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/passbook/app_gw/forms.py b/passbook/app_gw/forms.py index 928e0f7d5..fb3df1507 100644 --- a/passbook/app_gw/forms.py +++ b/passbook/app_gw/forms.py @@ -1,4 +1,5 @@ """passbook Application Security Gateway Forms""" +from urllib.parse import urlparse from django import forms from django.contrib.admin.widgets import FilteredSelectMultiple @@ -19,9 +20,18 @@ class ApplicationGatewayProviderForm(forms.ModelForm): if ApplicationGatewayProvider.objects \ .filter(server_name__overlap=current) \ .exclude(pk=self.instance.pk).exists(): - raise ValidationError("Server Name already in use.") + raise ValidationError(_("Server Name already in use.")) return current + def clean_upstream(self): + """Check that upstream begins with http(s)""" + for upstream in self.cleaned_data.get('upstream'): + _parsed_url = urlparse(upstream) + + if _parsed_url.scheme not in ('http', 'https'): + raise ValidationError(_("URL Scheme must be either http or https")) + return self.cleaned_data.get('upstream') + class Meta: model = ApplicationGatewayProvider