diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-11-13 15:45:40 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-11-13 15:45:40 -0500 |
| commit | aa9c18e60ad6608c57545159980fbc66a92b637a (patch) | |
| tree | 88a41e4970b8da27e7d5bbace648d0fe56073493 /roles | |
| parent | feb0e25b3ba3deb2c97d707e6000efa9743eb9c0 (diff) | |
| download | openshift-aa9c18e60ad6608c57545159980fbc66a92b637a.tar.gz openshift-aa9c18e60ad6608c57545159980fbc66a92b637a.tar.bz2 openshift-aa9c18e60ad6608c57545159980fbc66a92b637a.tar.xz openshift-aa9c18e60ad6608c57545159980fbc66a92b637a.zip | |
Regex anchors changed to match protocol start and ports.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
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 }} |