summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Zagaynov <azagayno@redhat.com>2017-08-30 11:21:22 +0200
committerAlexander Zagaynov <azagayno@redhat.com>2017-08-30 11:21:22 +0200
commit72dc64790cb59856568dd69d65d5584a65ea4ea0 (patch)
tree1d866016a4c5a70571727e2f0ec93748afe6d1c0
parent6598350bc87d74a0b330cfdffc3ef956d96c7987 (diff)
downloadopenshift-72dc64790cb59856568dd69d65d5584a65ea4ea0.tar.gz
openshift-72dc64790cb59856568dd69d65d5584a65ea4ea0.tar.bz2
openshift-72dc64790cb59856568dd69d65d5584a65ea4ea0.tar.xz
openshift-72dc64790cb59856568dd69d65d5584a65ea4ea0.zip
escape corsAllowedOrigins regexp strings and anchor them
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index c14579435..abd2f9a59 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -59,7 +59,7 @@ controllerConfig:
controllers: '*'
corsAllowedOrigins:
{% for origin in ['127.0.0.1', 'localhost', openshift.common.ip, openshift.common.public_ip] | union(openshift.common.all_hostnames) | unique %}
- - {{ origin }}
+ - (?i)\A{{ origin | regex_escape() }}\z
{% endfor %}
{% for custom_origin in openshift.master.custom_cors_origins | default("") %}
- {{ custom_origin }}