openstack
/
puppet-horizon
Code Issues Proposed changes

Merge "Fix how disallow_iframe_embed is defined" into stable/ussuri

This commit is contained in:
Zuul 2021-11-23 17:53:39 +00:00 committed by Gerrit Code Review
parent 1e209cbf69 c65b7a89c6
commit e127ca84a3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/bug-1942722-3cc45ac696688336.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixed wrong usage of the ``DISALLOW_IFRAME_EMBED`` option.

7
spec/classes/horizon_init_spec.rb
View File

@ -216,6 +216,7 @@ describe 'horizon' do
'COMPRESS_OFFLINE = False',
"FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'",
"OVERVIEW_DAYS_RANGE = 1",
'DISALLOW_IFRAME_EMBED = True',
])
end
@ -580,16 +581,16 @@ describe 'horizon' do
end
end
context 'with disallow iframe embed enabled' do
context 'with disallow iframe embed disabled' do
before do
params.merge!({
:disallow_iframe_embed => true
:disallow_iframe_embed => false
})
end
it 'disallow_iframe_embed is configured' do
verify_concat_fragment_contents(catalogue, 'local_settings.py', [
'HORIZON_CONFIG["disallow_iframe_embed"] = True',
'DISALLOW_IFRAME_EMBED = False',
])
end
end

4
templates/local_settings.py.erb
View File

@ -1012,9 +1012,7 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK_HYPERVISOR_FEATURES',
# For more information see:
# http://tinyurl.com/anticlickjack
#DISALLOW_IFRAME_EMBED = True
<% if @disallow_iframe_embed == true %>
HORIZON_CONFIG["disallow_iframe_embed"] = True
<% end %>
DISALLOW_IFRAME_EMBED = <%= @disallow_iframe_embed.to_s.capitalize %>
<% if @horizon_upload_mode %>
HORIZON_IMAGES_UPLOAD_MODE = <%= @horizon_upload_mode %>