diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7e74b9b3..39a5a8caf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,7 +104,7 @@ jobs: bundle install --jobs 4 --retry 4 yarn install sudo apt-get update - sudo apt-get install libvips liblept5 + sudo apt-get install libvips libleptonica6 - name: Run Brakeman run: bundle exec brakeman -q --exit-on-warn diff --git a/Gemfile.lock b/Gemfile.lock index cf3505a23..437ca5c48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,7 +75,7 @@ GEM securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) - addressable (2.9.0) + addressable (2.9.2) public_suffix (>= 2.0.2, < 8.0) annotaterb (4.22.0) activerecord (>= 6.0.0) @@ -309,7 +309,7 @@ GEM minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) - msgpack (1.8.4) + msgpack (1.8.7) multi_json (1.21.2) net-http (0.9.1) uri (>= 0.11.1) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 949cea168..141ecdeae 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -49,9 +49,11 @@ class AccountsController < ApplicationController def destroy authorize!(:manage, current_account) + removed_email = true_user.email.sub('@', '+removed@') + removed_email = true_user.email.sub('@', "+removed#{Time.current.to_i}@") if User.exists?(email: removed_email) + true_user.skip_reconfirmation! - true_user.update!(locked_at: Time.current, archived_at: Time.current, - email: true_user.email.sub('@', '+removed@')) + true_user.update!(locked_at: Time.current, archived_at: Time.current, email: removed_email) true_user.account.update!(archived_at: Time.current) # rubocop:disable-next Layout/LineLength diff --git a/app/controllers/api/active_storage_blobs_proxy_controller.rb b/app/controllers/api/active_storage_blobs_proxy_controller.rb index 5696830ec..bbcd8c694 100644 --- a/app/controllers/api/active_storage_blobs_proxy_controller.rb +++ b/app/controllers/api/active_storage_blobs_proxy_controller.rb @@ -42,21 +42,21 @@ module Api authorization_check!(attachment, @record, exp) + no_store + if request.headers['Range'].present? send_blob_byte_range_data blob, request.headers['Range'] else - http_cache_forever public: true do - response.headers['Accept-Ranges'] = 'bytes' + response.headers['Accept-Ranges'] = 'bytes' - if request.head? - response.headers['Content-Type'] = blob.content_type_for_serving - head :ok - else - send_blob_stream blob, disposition: params[:disposition] - end - - response.headers['Content-Length'] = blob.byte_size.to_s + if request.head? + response.headers['Content-Type'] = blob.content_type_for_serving + head :ok + else + send_blob_stream blob, disposition: params[:disposition] end + + response.headers['Content-Length'] = blob.byte_size.to_s end end diff --git a/app/controllers/api/submitters_controller.rb b/app/controllers/api/submitters_controller.rb index eee1e835c..5b91fec68 100644 --- a/app/controllers/api/submitters_controller.rb +++ b/app/controllers/api/submitters_controller.rb @@ -158,7 +158,9 @@ module Api if attrs[:completed] submitter.values = Submitters::SubmitValues.merge_default_values(submitter) - submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) + submitter.values = Submitters::SubmitValues.maybe_remove_condition_values( + submitter, formula_values: Submitters::SubmitValues.build_formula_values(submitter) + ) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/app/controllers/mcp/send_documents_controller.rb b/app/controllers/mcp/send_documents_controller.rb index a4c5a7125..0517008cc 100644 --- a/app/controllers/mcp/send_documents_controller.rb +++ b/app/controllers/mcp/send_documents_controller.rb @@ -78,6 +78,12 @@ module Mcp return render_tool_error('Template has no fields') if @template.fields.blank? + if @template.variables_schema.present? + Rollbar.warning("MCP send variables template: #{@template.id}") if defined?(Rollbar) + + return render_tool_error('Templates with variables are not supported') + end + submitters = (mcp_params['submitters'] || []).map do |s| attrs = s.slice('email', 'name', 'role', 'phone').compact_blank diff --git a/app/controllers/submit_form_controller.rb b/app/controllers/submit_form_controller.rb index 662ec8dee..cda3992fc 100644 --- a/app/controllers/submit_form_controller.rb +++ b/app/controllers/submit_form_controller.rb @@ -51,7 +51,7 @@ class SubmitFormController < ApplicationController end def update - unless Submitters::AuthorizedForForm.call(@submitter, current_user, request) + unless Submitters::AuthorizedForForm.call(@submitter, current_user, request, with_order: with_order(@submitter)) return render json: { error: I18n.t('verification_required_refresh_the_page_and_pass_2fa') }, status: :unprocessable_content end @@ -154,6 +154,11 @@ class SubmitFormController < ApplicationController .preload(:blob).index_by(&:uuid) end + def with_order(submitter) + params[:completed] == 'true' && submitter.present? && + submitter.submission.template&.preferences&.dig('submitters_order') == 'preserved' + end + def lang params[:lang].presence end diff --git a/app/controllers/submit_form_decline_controller.rb b/app/controllers/submit_form_decline_controller.rb index 139175cf1..9f8fcf5fa 100644 --- a/app/controllers/submit_form_decline_controller.rb +++ b/app/controllers/submit_form_decline_controller.rb @@ -16,7 +16,8 @@ class SubmitFormDeclineController < ApplicationController @submitter.viewer? || !Submitters::AuthorizedForForm.call(@submitter, current_user, - request) + request, + with_order: true) ApplicationRecord.transaction do @submitter.update!(declined_at: Time.current, values: @submitter.preferences['default_values'] || {}) diff --git a/app/controllers/submit_form_invite_controller.rb b/app/controllers/submit_form_invite_controller.rb index 0976d028f..ed9796ff0 100644 --- a/app/controllers/submit_form_invite_controller.rb +++ b/app/controllers/submit_form_invite_controller.rb @@ -49,7 +49,7 @@ class SubmitFormInviteController < ApplicationController !submitter.submission.expired? && !submitter.submission.template&.archived_at? && !submitter.viewer? && - Submitters::AuthorizedForForm.call(submitter, current_user, request) + Submitters::AuthorizedForForm.call(submitter, current_user, request, with_order: true) end def filter_invite_submitters(submitter, key = 'invite_by_uuid') diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue index 1070304e2..8bdc64960 100644 --- a/app/javascript/submission_form/form.vue +++ b/app/javascript/submission_form/form.vue @@ -660,7 +660,7 @@ :native-platform="nativePlatform" />