openstack/octavia
Code Issues Proposed changes

Merge "Use rfc3986 module for URL validations"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 20:28:58 +00:00 committed by Gerrit Code Review
commit a011b405a7
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/common/constants.py
View File

@ -116,9 +116,6 @@ MAX_POLICY_POSITION = 2147483647
# 53 rules per policy # 53 rules per policy
MAX_L7RULES_PER_L7POLICY = 50 MAX_L7RULES_PER_L7POLICY = 50
URL_REGEX = (r'\Ahttp[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*(),]|'
r'(?:%[0-9a-fA-F][0-9a-fA-F]))+')
# See RFCs 2616, 2965, 6265, 7230: Should match characters valid in a # See RFCs 2616, 2965, 6265, 7230: Should match characters valid in a
# http header or cookie name. # http header or cookie name.
HTTP_HEADER_NAME_REGEX = r'\A[a-zA-Z0-9!#$%&\'*+-.^_`|~]+\Z' HTTP_HEADER_NAME_REGEX = r'\A[a-zA-Z0-9!#$%&\'*+-.^_`|~]+\Z'

10
octavia/common/validate.py
View File

@ -20,6 +20,7 @@ Defined here so these can also be used at deeper levels than the API.
import re import re
import rfc3986
from octavia.common import constants from octavia.common import constants
from octavia.common import exceptions from octavia.common import exceptions
@ -27,8 +28,13 @@ from octavia.common import exceptions
def url(url): def url(url):
"""Raises an error if the url doesn't look like a URL.""" """Raises an error if the url doesn't look like a URL."""
p = re.compile(constants.URL_REGEX) try:
if not p.match(url): if not rfc3986.is_valid_uri(url, require_scheme=True):
raise exceptions.InvalidURL(url=url)
p_url = rfc3986.urlparse(rfc3986.normalize_uri(url))
if p_url.scheme != 'http' and p_url.scheme != 'https':
raise exceptions.InvalidURL(url=url)
except Exception:
raise exceptions.InvalidURL(url=url) raise exceptions.InvalidURL(url=url)
return True return True

4
octavia/tests/unit/common/test_validations.py
View File

@ -29,6 +29,10 @@ class TestValidations(base.TestCase):
def test_validate_bad_url(self): def test_validate_bad_url(self):
self.assertRaises(exceptions.InvalidURL, validate.url, 'bad url') self.assertRaises(exceptions.InvalidURL, validate.url, 'bad url')
def test_validate_url_bad_schema(self):
self.assertRaises(exceptions.InvalidURL, validate.url,
'ssh://www.example.com/')
def test_validate_header_name(self): def test_validate_header_name(self):
ret = validate.header_name('Some-header') ret = validate.header_name('Some-header')
self.assertTrue(ret) self.assertTrue(ret)

1
requirements.txt
View File

@ -8,6 +8,7 @@ SQLAlchemy<1.1.0,>=1.0.10 # MIT
Babel>=1.3 # BSD Babel>=1.3 # BSD
eventlet!=0.18.3,>=0.18.2 # MIT eventlet!=0.18.3,>=0.18.2 # MIT
requests!=2.9.0,>=2.8.1 # Apache-2.0 requests!=2.9.0,>=2.8.1 # Apache-2.0
rfc3986>=0.2.0 # Apache-2.0
keystoneauth1>=2.1.0 # Apache-2.0 keystoneauth1>=2.1.0 # Apache-2.0
keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0 keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0
python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0 python-neutronclient!=4.1.0,>=2.6.0 # Apache-2.0