Repository navigation
Fix CSP blocking the PDF viewer when files are stored in a remote storage service #134
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
antopalidi
wants to merge
2
commits into
main
Choose a base branch
from
bugfix/csp-connect-src-remote-storage
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -9,6 +9,7 @@ on: | |||||
| env: | ||||||
| RUBY_VERSION: 3.2.6 | ||||||
| NODE_VERSION: 18.17.1 | ||||||
| NODE_OPTIONS: "--experimental-global-webcrypto" | ||||||
| DISABLE_SPRING: 1 | ||||||
| CI: "true" | ||||||
|
|
||||||
|
|
@@ -39,7 +40,7 @@ jobs: | |||||
| fetch-depth: 1 | ||||||
|
|
||||||
| - name: Install imagemagick and wkhtmltopdf | ||||||
| run: sudo apt install imagemagick wkhtmltopdf | ||||||
| run: sudo apt-get update && sudo apt-get install -y imagemagick wkhtmltopdf | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
We don't need that anymore right? |
||||||
|
|
||||||
| - uses: ruby/setup-ruby@v1 | ||||||
| with: | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
spec/controllers/decidim/participatory_documents/admin/documents_controller_spec.rb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require "spec_helper" | ||
|
|
||
| module Decidim | ||
| module ParticipatoryDocuments | ||
| module Admin | ||
| describe DocumentsController do | ||
| routes { Decidim::ParticipatoryDocuments::AdminEngine.routes } | ||
|
|
||
| let(:organization) { component.organization } | ||
| let(:participatory_process) { component.participatory_space } | ||
| let(:component) { document.component } | ||
| let(:document) { create(:participatory_documents_document, :with_file) } | ||
| let(:user) { create(:user, :admin, :confirmed, organization:) } | ||
|
|
||
| before do | ||
| request.env["decidim.current_organization"] = organization | ||
| request.env["decidim.current_participatory_space"] = participatory_process | ||
| request.env["decidim.current_component"] = component | ||
| sign_in user | ||
| end | ||
|
|
||
| describe "GET pdf_viewer" do | ||
| context "when the file is stored in a remote service" do | ||
| let(:remote_url) { "https://eu2.contabostorage.com/bucket/file.pdf?X-Amz-Signature=abc" } | ||
|
|
||
| before do | ||
| allow(ActiveStorage::Blob.service).to receive(:url).and_return(remote_url) | ||
| end | ||
|
|
||
| it "appends the storage host to the connect-src CSP directive" do | ||
| get :pdf_viewer | ||
| expect(response.headers["Content-Security-Policy"]).to match(%r{connect-src [^;]*https://eu2\.contabostorage\.com}) | ||
| end | ||
| end | ||
| end | ||
|
antopalidi marked this conversation as resolved.
|
||
|
|
||
| describe "GET edit_pdf" do | ||
| context "when the file is stored in a remote service" do | ||
| let(:remote_url) { "https://eu2.contabostorage.com/bucket/file.pdf?X-Amz-Signature=abc" } | ||
|
|
||
| before do | ||
| allow(ActiveStorage::Blob.service).to receive(:url).and_return(remote_url) | ||
| end | ||
|
|
||
| it "appends the storage host to the connect-src CSP directive" do | ||
| get :edit_pdf | ||
| expect(response.headers["Content-Security-Policy"]).to match(%r{connect-src [^;]*https://eu2\.contabostorage\.com}) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
60 changes: 60 additions & 0 deletions
60
spec/controllers/decidim/participatory_documents/documents_controller_spec.rb
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| require "spec_helper" | ||
|
|
||
| module Decidim | ||
| module ParticipatoryDocuments | ||
| describe DocumentsController do | ||
| routes { Decidim::ParticipatoryDocuments::Engine.routes } | ||
|
|
||
| let(:organization) { component.organization } | ||
| let(:participatory_process) { component.participatory_space } | ||
| let(:component) { document.component } | ||
| let(:document) { create(:participatory_documents_document, :with_file) } | ||
|
|
||
| before do | ||
| request.env["decidim.current_organization"] = organization | ||
| request.env["decidim.current_participatory_space"] = participatory_process | ||
| request.env["decidim.current_component"] = component | ||
| end | ||
|
|
||
| describe "GET pdf_viewer" do | ||
| it "renders the pdf_viewer template" do | ||
| get :pdf_viewer | ||
| expect(response).to render_template("pdf_viewer") | ||
| end | ||
|
|
||
| context "when the file is stored in a remote service" do | ||
| let(:remote_url) { "https://eu2.contabostorage.com/bucket/file.pdf?X-Amz-Signature=abc" } | ||
|
|
||
| before do | ||
| allow(ActiveStorage::Blob.service).to receive(:url).and_return(remote_url) | ||
| end | ||
|
|
||
| it "appends the storage host to the connect-src CSP directive" do | ||
| get :pdf_viewer | ||
| expect(response.headers["Content-Security-Policy"]).to match(%r{connect-src [^;]*https://eu2\.contabostorage\.com}) | ||
| end | ||
| end | ||
|
|
||
| context "when the file is stored in the local service" do | ||
| it "does not append the request host to the connect-src CSP directive" do | ||
| get :pdf_viewer | ||
| csp = response.headers["Content-Security-Policy"] | ||
| expect(csp).to match(/connect-src [^;]*'self'/) | ||
| expect(csp[/connect-src [^;]*/]).not_to include("test.host") | ||
| end | ||
| end | ||
|
|
||
| context "when the document has no file attached" do | ||
| let(:document) { create(:participatory_documents_document) } | ||
|
|
||
| it "renders without altering the connect-src CSP directive" do | ||
| get :pdf_viewer | ||
| expect(response.headers["Content-Security-Policy"][/connect-src [^;]*/]).not_to include("test.host") | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious about this? what is it?