OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
support linked images in PDF when OpenProject is served from a subfolder
as-opb69a32e9fd1d
diff --git a/app/models/exports/pdf/common/attachments.rb b/app/models/exports/pdf/common/attachments.rbindex dbe6780b993..79dab148534 100644--- a/app/models/exports/pdf/common/attachments.rb+++ b/app/models/exports/pdf/common/attachments.rb@@ -89,13 +89,14 @@ module Exports::PDF::Common::Attachmentsdef attachment_by_api_content_src(src)return nil if src.empty?- # we only accept absolute paths containing /attachments/:id/- # to prevent accessing hot-linked attachments from other hosts e.g. https://example.com/attachments/1/somefile.png- # we only accept sources like- # /api/v3/attachments/:id/content (our default api path)- # /attachments/:id/filename.ext (inserted by drag and drop from the files tab)+ # we accept absolut linked images+ # (but not hot-linked from elsewhere: https://example.com/another_api/attachments/1/somefile.png)+ #+ # #{api_url_helpers.root_path}api/v3/attachments/:id/content (our default api path)+ # #{api_url_helpers.root_path}attachments/:id/filename.ext (e.g. inserted by drag and drop from the files tab)+attachment_regex = %r{/attachments/(\d+)/}- return nil unless src.start_with?("/") && src.match?(attachment_regex)+ return nil unless src.start_with?(api_url_helpers.root_path) && src.match?(attachment_regex)attachments_id = src.scan(attachment_regex).first.firstattachment = Attachment.find_by(id: attachments_id.to_i)diff --git a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rbindex 329ea48ae7f..cc78b6bd6af 100644--- a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb+++ b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb@@ -33,6 +33,7 @@ require "spec_helper"RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf doinclude Redmine::I18ninclude PDFExportSpecUtils+let(:type) docreate(:type_bug,custom_fields: [cf_long_text, cf_empty_long_text, cf_disabled_in_project, cf_global_bool, cf_link])@@ -148,6 +149,12 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf do<figcaption>Image Caption</figcaption></figure></p>+ <figure class="op-uc-figure">+ <div class="op-uc-figure--content">+ <img class="op-uc-image" src="/attachments/#{image_attachment.id}/image.png" alt='"image redirect"'>+ </div>+ <figcaption>Image Redirect</figcaption>+ </figure><p><unknown-tag>Foo</unknown-tag></p><img class="op-uc-image op-uc-image_inline" src="/api/v3/attachments/#{image_attachment_elsewhere.id}/content">DESCRIPTION@@ -290,13 +297,14 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf do"Lorem", " ", "ipsum", " ", "dolor", " ", "sit", " ","amet", ", consetetur sadipscing elitr.", " ", "@OpenProject Admin","Image Caption",- "Foo","1", export_date_formatted, project.name,+ "Image Redirect",+ "Foo","2", export_date_formatted, project.name].flatten.join(" ")expect(result).to eq(expected_result)expect(result).not_to include("DisabledCustomField")- expect(pdf[:images].length).to eq(3)+ expect(pdf[:images].length).to eq(4)endend