Update URL validation to support FQDNs for rtsp/rtp protocols and improve regex pattern for flexibility.

This commit is contained in:
SergeantPanda 2025-11-11 17:17:01 -06:00
parent ae8b85a3e2
commit 21723e29bc

View file

@ -377,12 +377,13 @@ def validate_flexible_url(value):
import re
# More flexible pattern for non-FQDN hostnames with paths
# Matches: http://hostname, http://hostname/, http://hostname:port/path/to/file.xml, rtp://192.168.2.1, rtsp://192.168.178.1
non_fqdn_pattern = r'^(rts?p|https?)://([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])|[0-9.]+)?(\:[0-9]+)?(/[^\s]*)?$'
# Matches: http://hostname, https://hostname/, http://hostname:port/path/to/file.xml, rtp://192.168.2.1, rtsp://192.168.178.1
# Also matches FQDNs for rtsp/rtp protocols: rtsp://FQDN/path?query=value
non_fqdn_pattern = r'^(rts?p|https?)://([a-zA-Z0-9]([a-zA-Z0-9\-\.]{0,61}[a-zA-Z0-9])?|[0-9.]+)?(\:[0-9]+)?(/[^\s]*)?$'
non_fqdn_match = re.match(non_fqdn_pattern, value)
if non_fqdn_match:
return # Accept non-FQDN hostnames
return # Accept non-FQDN hostnames and rtsp/rtp URLs
# If it doesn't match our flexible patterns, raise the original error
raise ValidationError("Enter a valid URL.")