summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-13 22:58:36 -0500
committerGitHub <noreply@github.com>2017-11-13 22:58:36 -0500
commite4e4f8f728bbd3232b1929fcfe2c63e62b51b658 (patch)
treeb582b46e09675cc513e143dd865817a2aed96b03
parent97cb25e5711f5201b5fecbc8ab7c27511d3f475f (diff)
parentaa9c18e60ad6608c57545159980fbc66a92b637a (diff)
downloadopenshift-e4e4f8f728bbd3232b1929fcfe2c63e62b51b658.tar.gz
openshift-e4e4f8f728bbd3232b1929fcfe2c63e62b51b658.tar.bz2
openshift-e4e4f8f728bbd3232b1929fcfe2c63e62b51b658.tar.xz
openshift-e4e4f8f728bbd3232b1929fcfe2c63e62b51b658.zip
Merge pull request #6104 from kwoodson/regex_cors_fix
Regex anchors changed to match protocol start and ports.
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index c83fc9fbb..5bc135601 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -60,10 +60,10 @@ controllers: '*'
corsAllowedOrigins:
# anchor with start (\A) and end (\z) of the string, make the check case insensitive ((?i)) and escape hostname
{% for origin in ['127.0.0.1', 'localhost', openshift.common.ip, openshift.common.public_ip] | union(openshift.common.all_hostnames) | unique %}
- - (?i)\A{{ origin | regex_escape() }}\z
+ - (?i)//{{ origin | regex_escape() }}(:|\z)
{% endfor %}
{% for custom_origin in openshift.master.custom_cors_origins | default("") %}
- - (?i)\A{{ custom_origin | regex_escape() }}\z
+ - (?i)//{{ custom_origin | regex_escape() }}(:|\z)
{% endfor %}
{% if 'disabled_features' in openshift.master %}
disabledFeatures: {{ openshift.master.disabled_features | to_json }}