Adds root domain validation
Root domains cannot be used as domains, as they cannot be CNAMED. So, if a user uses a root domain in service domains, an error is returned. Closes-Bug: 1473193 Change-Id: Ic755643c1506d5e1fbcd5a7efe29bbc84e1ef9d6
This commit is contained in:
Obulpathi
Anantha Arunachalam
parent
2e3c61cbc0
commit
d4b1ac8355
@ -26,6 +26,7 @@ import jsonschema
|
||||
import pecan
|
||||
|
||||
from poppy.common import util
|
||||
from poppy.transport.validators import root_domain_regexes as regexes
|
||||
from poppy.transport.validators.stoplight import decorators
|
||||
from poppy.transport.validators.stoplight import exceptions
|
||||
|
||||
@ -160,6 +161,37 @@ def is_valid_origin(origin):
|
||||
is_valid_ip_address(origin.get('origin')))
|
||||
|
||||
|
||||
def is_root_domain(domain):
|
||||
domain_name = domain.get('domain')
|
||||
|
||||
# if the domain contains four or more segments, it a not a root domain
|
||||
if re.search(regexes.four_or_more_segments, domain_name):
|
||||
return False
|
||||
|
||||
cc_tld = (re.search(regexes.generic_cc_tld, domain_name) or
|
||||
re.search(regexes.generic_cc_tld, domain_name) or
|
||||
re.search(regexes.australia_tld, domain_name) or
|
||||
re.search(regexes.austria_tld, domain_name) or
|
||||
re.search(regexes.france_tld, domain_name) or
|
||||
re.search(regexes.hungary_tld, domain_name) or
|
||||
re.search(regexes.russia_tld, domain_name) or
|
||||
re.search(regexes.south_africa_tld, domain_name) or
|
||||
re.search(regexes.spain_tld, domain_name) or
|
||||
re.search(regexes.turkey_tld, domain_name) or
|
||||
re.search(regexes.uk_tld, domain_name) or
|
||||
re.search(regexes.usa_tld, domain_name))
|
||||
|
||||
# domain is a valid root domain if it is a
|
||||
# country code top level domain with three segments
|
||||
if cc_tld and re.match(regexes.three_segments, domain_name):
|
||||
return True
|
||||
# international top level domain with two segments
|
||||
elif re.match(regexes.two_segments, domain_name):
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def is_valid_service_configuration(service, schema):
|
||||
if schema is not None:
|
||||
errors_list = list(
|
||||
@ -282,7 +314,22 @@ def is_valid_service_configuration(service, schema):
|
||||
raise exceptions.ValidationFailed(
|
||||
u'Origin {0} is not valid'.format(origin.get('origin')))
|
||||
|
||||
# 10. Hostheadervalue must be valid
|
||||
# 10. domains must not be root domains
|
||||
if 'domains' in service:
|
||||
for domain in service['domains']:
|
||||
protocol = domain.get('protocol', 'http')
|
||||
certificate = domain.get('certificate')
|
||||
# for a shared SSL domains, domain name is a single segment
|
||||
# so, root domain validation does not apply to it
|
||||
if protocol == "https" and certificate == "shared":
|
||||
continue
|
||||
if is_root_domain(domain):
|
||||
raise exceptions.ValidationFailed(
|
||||
u'{0} is a root domain. Most DNS providers do not allow '
|
||||
'setting a CNAME on a root domain. Please use a subdomain '
|
||||
'instead (e.g. www.{0})'.format(domain.get('domain')))
|
||||
|
||||
# 11. Hostheadervalue must be valid
|
||||
if 'origins' in service:
|
||||
for origin in service['origins']:
|
||||
if 'hostheadervalue' in origin:
|
||||
@ -293,7 +340,7 @@ def is_valid_service_configuration(service, schema):
|
||||
u'HostHeaderValue {0} is not valid'.format(
|
||||
hostheadervalue))
|
||||
|
||||
# 11. Need to validate restriction correctness here
|
||||
# 12. Need to validate restriction correctness here
|
||||
# Cannot allow one restriction rule entity to have both
|
||||
# "blacklist" and "whitelist" restriction type
|
||||
whitelist_restriction_entities = {
|
||||
|
||||
75
poppy/transport/validators/root_domain_regexes.py
Normal file
75
poppy/transport/validators/root_domain_regexes.py
Normal file
@ -0,0 +1,75 @@
|
||||
# Copyright (c) 2015 Rackspace, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
# implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
|
||||
# Root domains can not be used as a service domains, as most of the DNS
|
||||
# providers does not allow setting a CNAME on a root domain. This file contains
|
||||
# regualr expressions used for checking if a domain is a root domain or not.
|
||||
|
||||
# regex for a generic country code based root domain
|
||||
generic_cc_tld = r'''([^.]+\.(ac|biz|co|com|edu|gov|id|int|ltd|me|mil|mod|
|
||||
my|name|net|nhs|nic|nom|or|org|plc|sch|web)\.(ac|ad|ae|af|ag|ai|al|am|
|
||||
an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|
|
||||
bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cu|cv|cw|cx|
|
||||
cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gd|
|
||||
ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|
|
||||
ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|
|
||||
kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|
|
||||
mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|
|
||||
om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|
|
||||
sc|sd|se|sg|sh|si|sk|sl|sm|sn|so|sr|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|
|
||||
tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|
|
||||
vn|vu|wf|ws|ye|yt|za|zm|zw))$'''
|
||||
|
||||
# edge cases regexs for country codes based root domain
|
||||
australia_tld = r'''([^.]+\.(act|asn|com|csiro|edu|gov|id|net|nsw|nt|org|oz|
|
||||
qld|sa|tas|vic|wa)\.au)$'''
|
||||
austria_tld = r'''([^.]+\.(ac|co|gv|or|priv)\.at)$'''
|
||||
france_tld = r'''([^.]+\.(aeroport|avocat|avoues|cci|chambagri|
|
||||
chirurgiens-dentistes|experts-comptables|geometre-expert|greta|
|
||||
huissier-justice|medecin|notaires|pharmacien|port|veterinaire)\.fr)$'''
|
||||
hungary_tld = r'''([^.]+\.(co|2000|erotika|jogasz|sex|video|info|agrar|film|
|
||||
konyvelo|shop|org|bolt|forum|lakas|suli|priv|casino|games|media|szex|
|
||||
sport|city|hotel|news|tozsde|tm|erotica|ingatlan|reklam|utazas)\
|
||||
.hu)$'''
|
||||
russia_tld = r'''([^.]+\.(ac|com|edu|int|net|org|pp|gov|mil|test|adygeya|
|
||||
bashkiria|ulan-ude|buryatia|dagestan|nalchik|kalmykia|kchr|ptz|karelia|
|
||||
komi|mari-el|joshkar-ola|mari|mordovia|yakutia|vladikavkaz|kazan|
|
||||
tatarstan|tuva|udmurtia|izhevsk|udm|khakassia|grozny|chuvashia|altai|
|
||||
kuban|krasnoyarsk|marine|vladivostok|stavropol|stv|khabarovsk|khv|amur|
|
||||
arkhangelsk|astrakhan|belgorod|bryansk|vladimir|volgograd|tsaritsyn|
|
||||
vologda|voronezh|vrn|cbg|ivanovo|irkutsk|koenig|kaluga|kamchatka|
|
||||
kemerovo|kirov|vyatka|kostroma|kurgan|kursk|lipetsk|magadan|mosreg|
|
||||
murmansk|nnov|nov|nsk|novosibirsk|omsk|orenburg|oryol|penza|perm|pskov|
|
||||
rnd|ryazan|samara|saratov|sakhalin|yuzhno-sakhalinsk|yekaterinburg|
|
||||
e-burg|smolensk|tambov|tver|tomsk|tsk|tom|tula|tyumen|simbirsk|
|
||||
chelyabinsk|chel|chita|yaroslavl|msk|spb|bir|jar|palana|dudinka|surgut|
|
||||
chukotka|yamal|amursk|baikal|cmw|fareast|jamal|kms|k-uralsk|kustanai|
|
||||
kuzbass|magnitka|mytis|nakhodka|nkz|norilsk|snz|oskol|pyatigorsk|
|
||||
rubtsovsk|syzran|vdonskzgrad)\.ru)$'''
|
||||
south_africa_tld = r'''([^.]+\.(ac|gov|law|mil|net|nom|school)\.za)$'''
|
||||
spain_tld = r'''([^.]+\.(gob|nom|org)\.es)$'''
|
||||
turkey_tld = r'''([^.]+\.(av|bbs|bel|biz|com|dr|edu|gen|gov|info|k12|kep|
|
||||
name|net|org|pol|tel|tsk|tv|web)\.tr)$'''
|
||||
uk_tld = r'''([^.]+\.(ac|co|gov|ltd|me|mod|net|nhs|org|plc|police|sch)
|
||||
\.uk)$'''
|
||||
usa_tld = r'''([^.]+\.(al|ak|az|ar|as|ca|co|ct|de|dc|fl|ga|gu|hi|id|il|in|
|
||||
ia|ks|ky|la|me|md|ma|mi|mn|mp|ms|mo|mt|ne|nv|nh|nj|nm|ny|nc|nd|oh|ok|
|
||||
or|pa|pr|ri|sc|sd|tn|tx|um|ut|vt|va|vi|wa|wv|wi|wy)\.us)$'''
|
||||
|
||||
# regexs for two, three and four segments
|
||||
two_segments = r'''^[^.]+\.[^.]+$'''
|
||||
three_segments = r'''^[^.]+\.[^.]+\.[^.]+$'''
|
||||
four_or_more_segments = r'''^[^.]+\.[^.]+\.[^.]+\.[^.]'''
|
||||
@ -29,7 +29,7 @@ class TestHttpService(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
|
||||
domain = self.generate_random_string(
|
||||
prefix='api-test-domain') + u'.com'
|
||||
prefix='www.api-test-domain') + u'.com'
|
||||
self.domain_list = [
|
||||
{"domain": domain, "protocol": "http"}
|
||||
]
|
||||
@ -356,7 +356,7 @@ class TestSanCertService(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
|
||||
domain = self.generate_random_string(
|
||||
prefix='api-test-domain') + '.com'
|
||||
prefix='www.api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{"domain": domain, "protocol": "https", "certificate": "san"}
|
||||
]
|
||||
@ -510,7 +510,7 @@ class TestCustomCertService(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
|
||||
domain = self.generate_random_string(
|
||||
prefix='api-test-domain') + '.com'
|
||||
prefix='www.api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{"domain": domain, "protocol": "https", "certificate": "custom"}
|
||||
]
|
||||
@ -664,7 +664,7 @@ class TestHttpServiceWithLogDelivery(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
|
||||
domain = self.generate_random_string(
|
||||
prefix='api-test-domain') + u'.com'
|
||||
prefix='www.api-test-domain') + u'.com'
|
||||
self.domain_list = [
|
||||
{"domain": domain, "protocol": "http"}
|
||||
]
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"all_fields": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -60,9 +60,9 @@
|
||||
},
|
||||
"caching_empty": {
|
||||
"name": "caching_empty",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -77,9 +77,9 @@
|
||||
},
|
||||
"multiple_origin_wildcard_caching": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"}],
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules":[
|
||||
@ -112,9 +112,9 @@
|
||||
},
|
||||
"multiple_origin_path_caching": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"}],
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules":[
|
||||
@ -147,7 +147,7 @@
|
||||
},
|
||||
"multiple_origin_path_multiple_caching_types": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"}],
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"port": 80,
|
||||
@ -186,10 +186,10 @@
|
||||
},
|
||||
"log_delivery_enabled": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -238,10 +238,10 @@
|
||||
},
|
||||
"log_delivery_disabled": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -291,9 +291,9 @@
|
||||
},
|
||||
"hyphen_in_domain_name": {
|
||||
"name": "caching_empty",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -309,8 +309,8 @@
|
||||
},
|
||||
"origin_hostheadertype": {
|
||||
"name": "origin_hostheadertype",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"hostheadertype": "origin",
|
||||
@ -325,8 +325,8 @@
|
||||
},
|
||||
"custom_hostheadertype": {
|
||||
"name": "custom_hostheadertype",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"hostheadertype": "custom",
|
||||
@ -342,8 +342,8 @@
|
||||
},
|
||||
"domain_hostheadertype": {
|
||||
"name": "domain_hostheadertype",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"hostheadertype": "domain",
|
||||
@ -358,8 +358,8 @@
|
||||
},
|
||||
"origin_hostheadertype_other_hostheadervalue": {
|
||||
"name": "origin_hostheadertype_other_hostheadervalue",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -375,8 +375,8 @@
|
||||
},
|
||||
"multiple_hostheadertypes": {
|
||||
"name": "multiple_hostheadertypes",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -410,8 +410,8 @@
|
||||
},
|
||||
"request_url_no_slashes": {
|
||||
"name": "multiple_hostheadertypes",
|
||||
"domain_list": [{"domain": "my-website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -445,10 +445,10 @@
|
||||
},
|
||||
"ip_restriction": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -494,10 +494,10 @@
|
||||
},
|
||||
"ip_restriction_blacklist": {
|
||||
"name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
@ -540,6 +540,39 @@
|
||||
}
|
||||
]}
|
||||
]
|
||||
}
|
||||
|
||||
},
|
||||
"non_root_domains": {
|
||||
"name": "non_root_domains",
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}],
|
||||
"hostheadertype": "custom",
|
||||
"hostheadervalue": "www.customweb.com"
|
||||
}],
|
||||
"caching_list": []
|
||||
},
|
||||
"international_non_root_domains": {
|
||||
"name": "international_non_root_domains",
|
||||
"domain_list": [{"domain": "www.mywebsite.co.in", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.ac.nz", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false,
|
||||
"rules": [
|
||||
{
|
||||
"name": "default",
|
||||
"request_url": "/*"
|
||||
}],
|
||||
"hostheadertype": "custom",
|
||||
"hostheadervalue": "www.customweb.com"
|
||||
}],
|
||||
"caching_list": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"invalid_name": {
|
||||
"service_name": "",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -15,9 +15,9 @@
|
||||
},
|
||||
"too_short_name": {
|
||||
"service_name": "ab",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -31,7 +31,7 @@
|
||||
"service_name": "abcdefg",
|
||||
"domain_list": [{"domain": "ab"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -45,7 +45,7 @@
|
||||
"service_name": "upper_case_domain",
|
||||
"domain_list": [{"domain": "ab"},
|
||||
{"domain": "Blog.UPPER.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -57,9 +57,9 @@
|
||||
},
|
||||
"too_long_name": {
|
||||
"service_name": "too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -73,7 +73,7 @@
|
||||
"service_name": "asdsad",
|
||||
"domain_list": [{"domain": "too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name_too_long_name"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -86,7 +86,7 @@
|
||||
"empty_domain_list": {
|
||||
"service_name": "empty_domain_list",
|
||||
"domain_list": [],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -111,7 +111,7 @@
|
||||
{"domain": "blog10.mywebsite.com"},
|
||||
{"domain": "blog11.mywebsite.com"}
|
||||
],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -128,7 +128,7 @@
|
||||
},
|
||||
"empty_origin_list": {
|
||||
"service_name": "empty_origin_list",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -140,7 +140,7 @@
|
||||
},
|
||||
"too_many_origins": {
|
||||
"service_name": "many_origin_list",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [
|
||||
{"origin": "origin1"},
|
||||
@ -164,7 +164,7 @@
|
||||
},
|
||||
"duplicate_origin_rule": {
|
||||
"service_name": "many_origin_list",
|
||||
"domain_list": [{"domain": "mywebsite.com"}],
|
||||
"domain_list": [{"domain": "www.mywebsite.com"}],
|
||||
"origin_list": [
|
||||
{"origin": "origin1"},
|
||||
{"origin": "origin2", "rules": [{"name" : "index", "request_url" : "/index.htm"}]},
|
||||
@ -179,7 +179,7 @@
|
||||
},
|
||||
"non_numeric_origin_port": {
|
||||
"service_name": "non_numeric_origin_port",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "invalid_origin_value",
|
||||
"port": "fourfourthree",
|
||||
@ -193,7 +193,7 @@
|
||||
},
|
||||
"non_boolean_origin_ssl": {
|
||||
"service_name": "non_boolean_origin_ssl",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "invalid_origin_value",
|
||||
"port": 443,
|
||||
@ -207,7 +207,7 @@
|
||||
},
|
||||
"invalid_origin_spaces_prefix": {
|
||||
"service_name": "invalid_origin_spaces_prefix",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": " spacesinorigin.com",
|
||||
"port": "80",
|
||||
@ -221,7 +221,7 @@
|
||||
},
|
||||
"invalid_origin_with_slash": {
|
||||
"service_name": "invalid_origin_with_slash",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": " originwithslash.com/slash",
|
||||
"port": "80",
|
||||
@ -235,7 +235,7 @@
|
||||
},
|
||||
"invalid_origin_http_prefix": {
|
||||
"service_name": "invalid_origin_http_prefix",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "http://origin.com",
|
||||
"port": "80",
|
||||
@ -249,7 +249,7 @@
|
||||
},
|
||||
"invalid_origin_https_prefix": {
|
||||
"service_name": "invalid_origin_https_prefix",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "https://origin.com",
|
||||
"port": "443",
|
||||
@ -263,7 +263,7 @@
|
||||
},
|
||||
"invalid_origin_non_ASCII": {
|
||||
"service_name": "invalid_origin_non_ASCII",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "קאַץ.com",
|
||||
"port": "443",
|
||||
@ -277,9 +277,9 @@
|
||||
},
|
||||
"invalid_flavor": {
|
||||
"service_name": "invalid_flavor",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"flavor_id": "non_exist",
|
||||
@ -292,9 +292,9 @@
|
||||
},
|
||||
"caching_list_no_name": {
|
||||
"service_name": "caching_list_no_name",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"ttl": 3600}],
|
||||
@ -302,9 +302,9 @@
|
||||
},
|
||||
"caching_list_no_rule_name": {
|
||||
"service_name": "caching_list_no_rule_name",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -315,9 +315,9 @@
|
||||
},
|
||||
"caching_list_no_rule_url": {
|
||||
"service_name": "caching_list_no_url",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -329,9 +329,9 @@
|
||||
},
|
||||
"caching_negative_ttl": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -343,9 +343,9 @@
|
||||
},
|
||||
"caching_duplicate_rule": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -361,9 +361,9 @@
|
||||
},
|
||||
"restrictions_empty_item": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -395,11 +395,11 @@
|
||||
},
|
||||
"http_domain_with_certificate": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com",
|
||||
"protocol": "http",
|
||||
"certificate": "shared"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -411,10 +411,10 @@
|
||||
},
|
||||
"https_domain_with_no_certificate": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com",
|
||||
"protocol": "https"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -426,11 +426,11 @@
|
||||
},
|
||||
"https_domain_with_invalid_certificate": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com",
|
||||
"protocol": "https",
|
||||
"certificate": "whatacert"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -446,7 +446,7 @@
|
||||
"protocol": "https",
|
||||
"certificate": "shared"},
|
||||
{"domain": "website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -477,9 +477,9 @@
|
||||
},
|
||||
"restrictions_no_rules": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -491,9 +491,9 @@
|
||||
},
|
||||
"restrictions_invalid_ip_address": {
|
||||
"service_name": "my_service_name",
|
||||
"domain_list": [{"domain": "mywebsite.com", "protocol": "http"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com", "protocol": "http"},
|
||||
{"domain": "blog.mywebsite.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -523,7 +523,7 @@
|
||||
},
|
||||
"origin_invalid_port": {
|
||||
"service_name": "origin_invalid_port",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "not an origin", "port": 8080, "rules":[{"name": "name", "request_url": "www.somewebsite.com"}]}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -535,7 +535,7 @@
|
||||
},
|
||||
"origin_null_port": {
|
||||
"service_name": "origin_null_port",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "not an origin", "port": null, "rules":[{"name": "name", "request_url": "www.somewebsite.com"}]}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -547,7 +547,7 @@
|
||||
},
|
||||
"origin_negative_port": {
|
||||
"service_name": "origin_negative_port",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "not an origin", "port": -80, "rules":[{"name": "name", "request_url": "www.somewebsite.com"}]}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -559,7 +559,7 @@
|
||||
},
|
||||
"origin_string_port": {
|
||||
"service_name": "origin_string_port",
|
||||
"domain_list": [{"domain": "mywebsite.com"},
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "not an origin", "port": "80", "rules":[{"name": "name", "request_url": "www.somewebsite.com"}]}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -575,7 +575,7 @@
|
||||
"protocol": "http",
|
||||
"certificate": "shared"},
|
||||
{"domain": "website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -595,7 +595,7 @@
|
||||
"protocol": "https",
|
||||
"certificate": "shared"},
|
||||
{"domain": "website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -615,7 +615,7 @@
|
||||
"protocol": "http",
|
||||
"certificate": "san"},
|
||||
{"domain": "website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -635,7 +635,7 @@
|
||||
"protocol": "http",
|
||||
"certificate": "custom"},
|
||||
{"domain": "website.com", "protocol": "http"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -654,7 +654,7 @@
|
||||
"domain_list": [{"domain": "sharedsslwebsite",
|
||||
"protocol": "https",
|
||||
"certificate": "shared"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -674,7 +674,7 @@
|
||||
"protocol": "https",
|
||||
"certificate": "shared"},
|
||||
{"domain": "httpwebsite"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": true}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -718,7 +718,7 @@
|
||||
"invalid_domain_name_with_space": {
|
||||
"service_name": "invalid_domain_name_with_space",
|
||||
"domain_list": [{"domain": "mywebsite.com "}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -731,7 +731,7 @@
|
||||
"invalid_domain_name_with_hyphen_at_benginning": {
|
||||
"service_name": "invalid_domain_name_with_hyphen",
|
||||
"domain_list": [{"domain": "abcd.-mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -744,7 +744,7 @@
|
||||
"invalid_domain_name_with_hyphen_at_end": {
|
||||
"service_name": "invalid_domain_name_with_hyphen",
|
||||
"domain_list": [{"domain": "mywebsite-.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -757,7 +757,7 @@
|
||||
"same_domain_and_origin": {
|
||||
"service_name": "same_domain_and_origin",
|
||||
"domain_list": [{"domain": "mywebsite.com "}],
|
||||
"origin_list": [{"origin": "mywebsite.com",
|
||||
"origin_list": [{"origin": "www.mywebsite.com",
|
||||
"port": 80,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
@ -769,8 +769,8 @@
|
||||
},
|
||||
"invalid_hostheadertype":{
|
||||
"service_name": "invalid_hostheadertype",
|
||||
"domain_list": [{"domain": "mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": "org"}],
|
||||
@ -779,8 +779,8 @@
|
||||
},
|
||||
"missing_hostheadervalue":{
|
||||
"service_name": "missing_hostheadervalue",
|
||||
"domain_list": [{"domain": "mywebsite.com"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
"domain_list": [{"domain": "www.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": "custom"}],
|
||||
@ -791,12 +791,12 @@
|
||||
"service_name": "nonASCII_hostheadertype",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com"
|
||||
"domain": "www.mywebsite.com"
|
||||
}
|
||||
],
|
||||
"origin_list": [
|
||||
{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": ": איבערזעצן"
|
||||
@ -809,12 +809,12 @@
|
||||
"service_name": "nonASCII_hostheadervalue",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com"
|
||||
"domain": "www.mywebsite.com"
|
||||
}
|
||||
],
|
||||
"origin_list": [
|
||||
{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": "custom",
|
||||
@ -828,12 +828,12 @@
|
||||
"service_name": "nonASCII_hostheadervalue",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com"
|
||||
"domain": "www.mywebsite.com"
|
||||
}
|
||||
],
|
||||
"origin_list": [
|
||||
{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": "custom",
|
||||
@ -847,12 +847,12 @@
|
||||
"service_name": "nonASCII_hostheadervalue",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com"
|
||||
"domain": "www.mywebsite.com"
|
||||
}
|
||||
],
|
||||
"origin_list": [
|
||||
{
|
||||
"origin": "mywebsite1.com",
|
||||
"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false,
|
||||
"hostheadertype": "custom",
|
||||
@ -861,5 +861,47 @@
|
||||
],
|
||||
"caching_list": [],
|
||||
"restrictions_list": []
|
||||
},
|
||||
"invalid_root_domain": {
|
||||
"service_name": "invalid_root_domain",
|
||||
"domain_list": [{"domain": "www.mywebsite.com"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
{"name": "home",
|
||||
"ttl": 1200,
|
||||
"rules": [{"name" : "index",
|
||||
"request_url" : "/index.htm"}]}],
|
||||
"restrictions_list": []
|
||||
},
|
||||
"invalid_country_level_root_domain_1": {
|
||||
"service_name": "invalid_country_level_root_domain_1",
|
||||
"domain_list": [{"domain": "mywebsite.co.uk"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
{"name": "home",
|
||||
"ttl": 1200,
|
||||
"rules": [{"name" : "index",
|
||||
"request_url" : "/index.htm"}]}],
|
||||
"restrictions_list": []
|
||||
},
|
||||
"invalid_country_level_root_domain_2": {
|
||||
"service_name": "invalid_country_level_root_domain2",
|
||||
"domain_list": [{"domain": "mywebsite.co.au"},
|
||||
{"domain": "blog.mywebsite.com"}],
|
||||
"origin_list": [{"origin": "myorigin.com",
|
||||
"port": 443,
|
||||
"ssl": false}],
|
||||
"caching_list": [{"name": "default", "ttl": 3600},
|
||||
{"name": "home",
|
||||
"ttl": 1200,
|
||||
"rules": [{"name" : "index",
|
||||
"request_url" : "/index.htm"}]}],
|
||||
"restrictions_list": []
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
},
|
||||
"domain_san_ssl": {
|
||||
"name": "domain_san_ssl",
|
||||
"domain_list": [{"domain": "sansslwebsite.com",
|
||||
"domain_list": [{"domain": "www.sansslwebsite.com",
|
||||
"protocol": "https",
|
||||
"certificate": "san"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
@ -47,7 +47,7 @@
|
||||
},
|
||||
"domain_custom_ssl": {
|
||||
"name": "domain_san_ssl",
|
||||
"domain_list": [{"domain": "customsslwebsite.com",
|
||||
"domain_list": [{"domain": "www.customsslwebsite.com",
|
||||
"protocol": "https",
|
||||
"certificate": "custom"}],
|
||||
"origin_list": [{"origin": "mywebsite1.com",
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -21,7 +21,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -58,7 +58,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -81,7 +81,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -118,7 +118,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -152,7 +152,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -287,7 +287,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -321,7 +321,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -371,7 +371,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -405,7 +405,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -456,7 +456,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
@ -491,7 +491,7 @@
|
||||
"name": "my_service_name",
|
||||
"domain_list": [
|
||||
{
|
||||
"domain": "mywebsite.com",
|
||||
"domain": "www.mywebsite.com",
|
||||
"protocol": "http"
|
||||
}
|
||||
],
|
||||
|
||||
@ -2,41 +2,41 @@
|
||||
"add_domain": [
|
||||
{"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}}
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}}
|
||||
],
|
||||
"replace_domain": [
|
||||
{"op": "replace",
|
||||
"path": "/domains/0",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}}
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}}
|
||||
],
|
||||
"add_multiple_domains": [
|
||||
{"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}},
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}},
|
||||
{"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}}
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}}
|
||||
],
|
||||
"add_same_domains_with_different_ssl": [
|
||||
{"skip_test": true,
|
||||
"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}},
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}},
|
||||
{"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "https"}}
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "https"}}
|
||||
],
|
||||
"add_and_remove_domains": [
|
||||
{"op": "add",
|
||||
"path": "/domains/-",
|
||||
"value": {"domain": "replaceme.com", "protocol": "http"}},
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "http"}},
|
||||
{"op": "remove",
|
||||
"path": "/domains/0"}
|
||||
],
|
||||
"add_domain_list": [
|
||||
{"op": "add",
|
||||
"path": "/domains",
|
||||
"value": [{"domain": "replaceme.com", "protocol": "http"}]}
|
||||
"value": [{"domain": "www.replaceme.com", "protocol": "http"}]}
|
||||
],
|
||||
"replace_service_name": [
|
||||
{"op": "replace",
|
||||
@ -308,7 +308,7 @@
|
||||
{
|
||||
"op": "replace",
|
||||
"path": "/domains/0",
|
||||
"value": {"domain": "replaceme.com", "protocol": "https",
|
||||
"value": {"domain": "www.replaceme.com", "protocol": "https",
|
||||
"certificate": "shared"}},
|
||||
{"op": "replace",
|
||||
"path": "/origins/0",
|
||||
|
||||
@ -229,5 +229,17 @@
|
||||
"rules": [{"name": "rule1", "client_ip": "5.6.7.8"}]
|
||||
}
|
||||
}
|
||||
],
|
||||
"add_root_domain":[
|
||||
{"op": "add",
|
||||
"path": "/domains/0",
|
||||
"value": {"domain": "website.com", "protocol": "http"}
|
||||
}
|
||||
],
|
||||
"add_root_domain2":[
|
||||
{"op": "add",
|
||||
"path": "/domains/0",
|
||||
"value": {"domain": "website.co.uk", "protocol": "http"}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -34,7 +34,8 @@ class TestServicePatch(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
self.log_delivery = {"enabled": False}
|
||||
|
||||
domain = self.generate_random_string(prefix='api-test-domain') + '.com'
|
||||
domain = self.generate_random_string(
|
||||
prefix='www.api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{
|
||||
"domain": domain,
|
||||
@ -114,7 +115,7 @@ class TestServicePatch(base.TestBase):
|
||||
if (domain['certificate'] == u'shared'):
|
||||
return self.generate_random_string(prefix='api-test-ssl')
|
||||
|
||||
return self.generate_random_string(prefix='api-test-ssl') + '.com'
|
||||
return self.generate_random_string(prefix='www.api-test-ssl') + '.com'
|
||||
|
||||
@ddt.file_data('data_patch_service.json')
|
||||
def test_patch_service(self, test_data):
|
||||
@ -186,7 +187,7 @@ class TestServicePatch(base.TestBase):
|
||||
self.assert_patch_service_details(body, self.original_service_details)
|
||||
|
||||
def test_patch_service_claim_relinquish_domain(self):
|
||||
newdomain = str(uuid.uuid4()) + ".com"
|
||||
newdomain = "www." + str(uuid.uuid4()) + ".com"
|
||||
add_domain = (
|
||||
[{
|
||||
"op": "add",
|
||||
@ -259,7 +260,7 @@ class TestServicePatch(base.TestBase):
|
||||
def test_patch_service_add_duplicate_domain(self):
|
||||
# create second service
|
||||
service_name = str(uuid.uuid1())
|
||||
duplicate_domain = str(uuid.uuid1()) + '.com'
|
||||
duplicate_domain = 'www.' + str(uuid.uuid1()) + '.com'
|
||||
domain_list = [{"domain": duplicate_domain, "protocol": "http"}]
|
||||
|
||||
origin = str(uuid.uuid1()) + '.com'
|
||||
@ -321,7 +322,8 @@ class TestServicePatchWithLogDelivery(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
self.log_delivery = {"enabled": True}
|
||||
|
||||
domain = self.generate_random_string(prefix='api-test-domain') + '.com'
|
||||
domain = self.generate_random_string(
|
||||
prefix='www.api-test-domain') + '.com'
|
||||
self.domain_list = [
|
||||
{
|
||||
"domain": domain,
|
||||
@ -401,7 +403,7 @@ class TestServicePatchWithLogDelivery(base.TestBase):
|
||||
if (domain['certificate'] == u'shared'):
|
||||
return self.generate_random_string(prefix='api-test-ssl')
|
||||
|
||||
return self.generate_random_string(prefix='api-test-ssl') + '.com'
|
||||
return self.generate_random_string(prefix='www.api-test-ssl') + '.com'
|
||||
|
||||
@ddt.file_data('data_patch_service.json')
|
||||
def test_patch_service(self, test_data):
|
||||
|
||||
@ -45,8 +45,8 @@ class TestCreateService(providers.TestProviderBase):
|
||||
|
||||
domain_list = test_data['domain_list']
|
||||
for item in domain_list:
|
||||
item['domain'] = self.generate_random_string(
|
||||
prefix='api-test-domain') + '.com'
|
||||
item['domain'] = self.generate_random_string(
|
||||
prefix='www.api-test-domain') + '.com'
|
||||
origin_list = test_data['origin_list']
|
||||
caching_list = test_data['caching_list']
|
||||
log_delivery = test_data.get('log_delivery')
|
||||
@ -174,7 +174,7 @@ class TestListServices(base.TestBase):
|
||||
service_name = str(uuid.uuid1())
|
||||
|
||||
self.domain_list = [{"domain": self.generate_random_string(
|
||||
prefix='api-test-domain') + '.com'}]
|
||||
prefix='www.api-test-domain') + '.com'}]
|
||||
|
||||
self.origin_list = [{"origin": self.generate_random_string(
|
||||
prefix='api-test-origin') + '.com', "port": 80, "ssl": False,
|
||||
@ -293,7 +293,7 @@ class TestServiceActions(base.TestBase):
|
||||
self.flavor_id = self.test_flavor
|
||||
|
||||
domain = self.generate_random_string(
|
||||
prefix='api-test-domain') + u'.com'
|
||||
prefix='www.api-test-domain') + u'.com'
|
||||
self.domain_list = [
|
||||
{"domain": domain, "protocol": "http"}
|
||||
]
|
||||
@ -457,8 +457,9 @@ class TestDefaultServiceFields(providers.TestProviderBase):
|
||||
def test_default_values(self, test_data):
|
||||
|
||||
domain_list = test_data['submit_value'].get('domain_list', [])
|
||||
|
||||
for item in domain_list:
|
||||
item['domain'] = str(uuid.uuid1()) + '.com'
|
||||
item['domain'] = 'www.' + str(uuid.uuid1()) + '.com'
|
||||
|
||||
origin_list = test_data['submit_value'].get('origin_list', [])
|
||||
caching_list = test_data['submit_value'].get('caching_list', [])
|
||||
|
||||
@ -47,7 +47,7 @@ class TestCreateSSLService(base.TestBase):
|
||||
prefix='shared-ssl')
|
||||
else:
|
||||
item['domain'] = self.generate_random_string(
|
||||
prefix='ssl-domain') + '.com'
|
||||
prefix='www.ssl-domain') + '.com'
|
||||
|
||||
origin_list = test_data['origin_list']
|
||||
caching_list = test_data['caching_list']
|
||||
@ -187,7 +187,7 @@ class TestPatchSSLService(base.TestBase):
|
||||
if (domain['certificate'] == u'shared'):
|
||||
return self.generate_random_string(prefix='api-test-ssl')
|
||||
|
||||
return self.generate_random_string(prefix='api-test-ssl') + '.com'
|
||||
return self.generate_random_string(prefix='www.api-test-ssl') + '.com'
|
||||
|
||||
@ddt.file_data('data_patch_service_ssl_domain.json')
|
||||
@ddt.file_data('failed.json')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user