Merge from docusealco/wip

.github/workflows/ci.yml

@@ -111,48 +111,39 @@ jobs:
   rspec:
     name: RSpec
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
+    container:
+      image: ruby:4.0.5-alpine
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:18
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: docuseal_test
-        ports: ["5432:5432"]
         options: >-
-          --health-cmd pg_isready
+          --health-cmd "pg_isready -U postgres -d docuseal_test"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
 
     steps:
+      - name: Install packages
+        run: apk add --no-cache build-base git libpq-dev yaml-dev nodejs yarn tar zstd gzip wget unzip vips leptonica chromium
       - uses: actions/checkout@v4
-      - name: Install Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 4.0.5
-      - name: Set up Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 20.19.0
-      - name: Install Chrome
-        uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: 125
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
           path: node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-musl-node-${{ hashFiles('**/yarn.lock') }}
       - name: Cache gems
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          key: ${{ runner.os }}-musl-gem-${{ hashFiles('**/Gemfile.lock') }}
           restore-keys: |
-            ${{ runner.os }}-gem-
+            ${{ runner.os }}-musl-gem-
       - name: Install dependencies
         env:
           RAILS_ENV: test
@@ -161,17 +152,20 @@ jobs:
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 4
           yarn install
-          sudo apt-get update
-          sudo apt-get install -y libvips liblept5
-          wget -O pdfium-linux.tgz "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/pdfium-linux-$(uname -m | sed 's/x86_64/x64/;s/aarch64/arm64/').tgz"
-          sudo tar -xzf pdfium-linux.tgz --strip-components=1 -C /usr/lib lib/libpdfium.so
-          rm -f pdfium-linux.tgz
+          wget -O pdfium-linux.zip "https://github.com/docusealco/pdfium-binaries/releases/download/20260813/pdfium-musl-$(uname -m).zip"
+          case "$(uname -m)" in
+            x86_64)  echo "c5c7dde243ecb66ab0819c8193515ef38ad53549fe260f3c2dfd93ea56eda2e7  pdfium-linux.zip" ;;
+            aarch64) echo "64c4483449b1b4dccc696ad0c5c96e0b7f74dcc57b4f23c676b7a70671b0bbb5  pdfium-linux.zip" ;;
+          esac | sha256sum -c -
+          unzip -q pdfium-linux.zip -d /tmp/pdfium-linux
+          cp /tmp/pdfium-linux/lib/libpdfium.so /usr/lib/libpdfium.so
+          rm -rf pdfium-linux.zip /tmp/pdfium-linux
       - name: Run
         env:
           RAILS_ENV: test
           NODE_ENV: test
           COVERAGE: true
-          DATABASE_URL: postgres://postgres:postgres@localhost:5432/docuseal_test
+          DATABASE_URL: postgres://postgres:postgres@postgres:5432/docuseal_test
         run: |
           bundle exec rake db:create
           bundle exec rake db:migrate

Dockerfile

@@ -9,10 +9,10 @@ RUN apk --no-cache add wget unzip && \
     wget https://raw.githubusercontent.com/impallari/DancingScript/master/OFL.txt && \
     wget https://raw.githubusercontent.com/notofonts/noto-fonts/refs/heads/main/LICENSE && \
     wget -O /model.onnx "https://github.com/docusealco/fields-detection/releases/download/2.0.0/model_704_int8.onnx" && \
-    wget -O pdfium-linux.zip "https://github.com/docusealco/pdfium-binaries/releases/download/20260613/pdfium-musl-$(uname -m).zip" && \
+    wget -O pdfium-linux.zip "https://github.com/docusealco/pdfium-binaries/releases/download/20260813/pdfium-musl-$(uname -m).zip" && \
     case "$(uname -m)" in \
-      x86_64)  echo "2c953ff72ee2dda07e7fc577e25841cc3d6464468a7c5adfaea574efcbc3b90b  pdfium-linux.zip" ;; \
-      aarch64) echo "23bbe287d2753fdb05741c7660647eb0ef0d2e4da2ce0722bfa9d9d455bd64e2  pdfium-linux.zip" ;; \
+      x86_64)  echo "c5c7dde243ecb66ab0819c8193515ef38ad53549fe260f3c2dfd93ea56eda2e7  pdfium-linux.zip" ;; \
+      aarch64) echo "64c4483449b1b4dccc696ad0c5c96e0b7f74dcc57b4f23c676b7a70671b0bbb5  pdfium-linux.zip" ;; \
     esac | sha256sum -c - && \
     mkdir -p /pdfium-linux && \
     unzip -q pdfium-linux.zip -d /pdfium-linux

Gemfile.lock

@@ -271,7 +271,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.21.1)
+    json (2.21.2)
     jwt (3.2.0)
       base64
     language_server-protocol (3.17.0.5)

app/controllers/accounts_controller.rb

@@ -23,17 +23,20 @@ class AccountsController < ApplicationController
     unless Docuseal.multitenant?
       @encrypted_config = EncryptedConfig.find_or_initialize_by(account: current_account,
                                                                 key: EncryptedConfig::APP_URL_KEY)
-      @encrypted_config.assign_attributes(app_url_params)
 
-      unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
-        @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
+      if can?(:manage, @encrypted_config)
+        @encrypted_config.assign_attributes(app_url_params)
 
-        return render :show, status: :unprocessable_content
+        unless URI.parse(@encrypted_config.value.to_s).class.in?([URI::HTTP, URI::HTTPS])
+          @encrypted_config.errors.add(:value, I18n.t('should_be_a_valid_url'))
+
+          return render :show, status: :unprocessable_content
+        end
+
+        @encrypted_config.save!
+
+        Docuseal.refresh_default_url_options!
       end
-
-      @encrypted_config.save!
-
-      Docuseal.refresh_default_url_options!
     end
 
     with_locale do
@@ -47,7 +50,8 @@ class AccountsController < ApplicationController
     authorize!(:manage, current_account)
 
     true_user.skip_reconfirmation!
-    true_user.update!(locked_at: Time.current, email: true_user.email.sub('@', '+removed@'))
+    true_user.update!(locked_at: Time.current, archived_at: Time.current,
+                      email: true_user.email.sub('@', '+removed@'))
     true_user.account.update!(archived_at: Time.current)
 
     # rubocop:disable Layout/LineLength

app/controllers/api/tools_controller.rb

@@ -17,24 +17,23 @@ module Api
 
     def verify
       file = Base64.decode64(params[:file])
-      pdf = HexaPDF::Document.new(io: StringIO.new(file))
 
       trusted_certs = Accounts.load_trusted_certs(current_account)
       is_checksum_found = CompletedDocument.exists?(sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(file)))
 
       render json: {
         checksum_status: is_checksum_found ? 'verified' : 'not_found',
-        signatures: pdf.signatures.map do |sig|
+        signatures: VerifyPdfSignature.call(StringIO.new(file), trusted_certs).map do |sig|
           {
-            verification_result: sig.verify(trusted_certs:).messages,
-            signer_name: sig.signer_name,
-            signing_reason: sig.signing_reason,
+            verification_result: sig.messages.map { |m| { type: m.status || :info, content: m.text } },
+            signer_name: sig.common_name,
+            signing_reason: sig.reason,
             signing_time: sig.signing_time,
-            signature_type: sig.signature_type
+            signature_type: sig.type
           }
         end
       }
-    rescue HexaPDF::MalformedPDFError
+    rescue Pdfium::PdfiumError
       render json: { error: 'Malformed PDF' }, status: :unprocessable_content
     end
   end

app/controllers/application_controller.rb

@@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base
   rescue_from RateLimit::LimitApproached do |e|
     Rollbar.error(e) if defined?(Rollbar)
 
-    redirect_to request.referer, alert: 'Too many requests', status: :too_many_requests
+    redirect_back_or_to root_path, alert: 'Too many requests'
   end
 
   if Rails.env.production? || Rails.env.test?

app/controllers/mfa_setup_controller.rb

@@ -14,14 +14,14 @@ class MfaSetupController < ApplicationController
   def edit; end
 
   def create
+    RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
+
     if current_user.validate_and_consume_otp!(params[:otp_attempt])
       current_user.otp_required_for_login = true
       current_user.save!
 
       redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_configured')
     else
-      RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
-
       @provision_url = current_user.otp_provisioning_uri(current_user.email, issuer: Docuseal.product_name)
 
       @error_message = I18n.t('code_is_invalid')
@@ -31,13 +31,13 @@ class MfaSetupController < ApplicationController
   end
 
   def destroy
+    RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
+
     if current_user.validate_and_consume_otp!(params[:otp_attempt])
       current_user.update!(otp_required_for_login: false, otp_secret: nil)
 
       redirect_to settings_profile_index_path, notice: I18n.t('2fa_has_been_removed')
     else
-      RateLimit.call("mfa-setup-otp-#{current_user.id}", limit: 5, ttl: 5.minutes, enabled: true)
-
       @error_message = I18n.t('code_is_invalid')
 
       render turbo_stream: turbo_stream.replace(:modal, template: 'mfa_setup/edit'), status: :unprocessable_content

app/controllers/start_form_controller.rb

@@ -8,13 +8,9 @@ class StartFormController < ApplicationController
 
   around_action :with_browser_locale, only: %i[show update completed]
   before_action :maybe_redirect_com, only: %i[show completed]
-  before_action :load_resubmit_submitter, only: :update
   before_action :load_template
   before_action :authorize_start!, only: :update
 
-  COOKIES_TTL = 12.hours
-  COOKIES_DEFAULTS = { httponly: true, secure: Rails.env.production? }.freeze
-
   def show
     if @template.preferences['require_phone_2fa'] || @template.preferences['require_email_2fa']
       raise ActionController::RoutingError, I18n.t('not_found')
@@ -23,8 +19,7 @@ class StartFormController < ApplicationController
     if @template.shared_link?
       @submitter = @template.submissions.new(account_id: @template.account_id)
                             .submitters.new(account_id: @template.account_id,
-                                            uuid: (filter_undefined_submitters(@template).first ||
-                                                  @template.submitters.first)['uuid'])
+                                            uuid: Submitters::StartForm.first_submitter_uuid(@template))
       render :email_verification if params[:email_verification]
     else
       Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
@@ -41,24 +36,28 @@ class StartFormController < ApplicationController
     if @submitter.completed_at?
       redirect_to start_form_completed_path(@template.slug, submitter_params.compact_blank)
     else
-      if filter_undefined_submitters(@template).size > 1 && @submitter.new_record?
+      if Templates.filter_undefined_submitters(@template.submitters).size > 1 && @submitter.new_record?
         @error_message = multiple_submitters_error_message
 
         return render :show, status: :unprocessable_content
       end
 
       if (is_new_record = @submitter.new_record?)
-        assign_submission_attributes(@submitter, @template)
+        Submitters::StartForm.assign_submission_attributes(
+          @submitter, @template, ip: request.remote_ip, user_agent: request.user_agent
+        )
 
         Submissions::AssignDefinedSubmitters.call(@submitter.submission)
       else
         @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
       end
 
-      if @template.preferences['shared_link_2fa'] == true
-        handle_require_2fa(@submitter, is_new_record:)
+      if require_link_2fa?(@template, @submitter)
+        handle_require_2fa(@template, @submitter)
       elsif @submitter.errors.blank? && @submitter.save
-        enqueue_new_submitter_jobs(@submitter) if is_new_record
+        Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
+
+        Submitters::StartForm.assign_start_form_cookie(@submitter, request)
 
         redirect_to submit_form_path(@submitter.slug)
       else
@@ -88,41 +87,40 @@ class StartFormController < ApplicationController
 
   private
 
-  def enqueue_new_submitter_jobs(submitter)
-    WebhookUrls.enqueue_events(submitter.submission, 'submission.created')
+  def find_or_initialize_submitter(template, submitter_params)
+    required_fields = template.preferences.fetch('link_form_fields', ['email'])
 
-    SearchEntries.enqueue_reindex(submitter)
+    blank_fields = required_fields.select { |key| submitter_params[key].blank? }
 
-    expire_at = submitter.submission.expire_at
-
-    return unless expire_at
-
-    ProcessSubmissionExpiredJob.perform_at(expire_at, 'submission_id' => submitter.submission_id,
-                                                      'expire_at' => expire_at.to_i)
-  end
-
-  def load_resubmit_submitter
-    @resubmit_submitter =
-      if params[:resubmit].present? && !params[:resubmit].in?([true, 'true'])
-        submitter = Submitter.find_by(slug: params[:resubmit])
-
-        submitter if submitter && can_resubmit?(submitter)
+    submitter =
+      if blank_fields.present?
+        Submitter.new(submitter_params)
+      else
+        Submitters::StartForm.find_or_initialize_submitter(
+          template, submitter_params, exclude_completed: params[:resubmit].present?,
+                                      request:, current_user:
+        )
       end
+
+    blank_fields.each { |key| submitter.errors.add(key.to_sym, :blank) }
+
+    submitter
   end
 
-  def can_resubmit?(submitter)
-    submitter.completed_at? && submitter.completed_at > 14.days.ago &&
-      %w[api embed mcp].exclude?(submitter.submission.source) &&
-      submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false
+  def require_link_2fa?(template, submitter)
+    return true if template.preferences['shared_link_2fa'] == true
+    return false if cookies.encrypted[:start_form_slug] == submitter.slug
+    return false if current_user && submitter.email == current_user.email &&
+                    current_user.account_id == submitter.account_id
+
+    !submitter.new_record?
   end
 
   def authorize_start!
     is_archived = @template.archived_at? || @template.account.archived_at?
 
-    return redirect_to submit_form_path(@resubmit_submitter.slug) if @resubmit_submitter && is_archived
     return redirect_to start_form_path(@template.slug) if is_archived
 
-    return if @resubmit_submitter
     return if @template.shared_link? || (current_user && current_ability.can?(:read, @template))
 
     Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
@@ -130,90 +128,14 @@ class StartFormController < ApplicationController
     redirect_to start_form_path(@template.slug)
   end
 
-  def find_or_initialize_submitter(template, submitter_params)
-    required_fields = template.preferences.fetch('link_form_fields', ['email'])
-
-    required_params = required_fields.index_with { |key| submitter_params[key] }
-
-    find_params = required_params.except('name')
-
-    submitter = Submitter.new if find_params.compact_blank.blank?
-
-    submitter ||=
-      Submitter
-      .where(submission: template.submissions.non_expired.active)
-      .order(id: :desc)
-      .where(declined_at: nil)
-      .where(external_id: nil)
-      .where(template.preferences['shared_link_2fa'] == true ? {} : { ip: [nil, request.remote_ip] })
-      .then { |rel| params[:resubmit].present? || params[:selfsign].present? ? rel.where(completed_at: nil) : rel }
-      .find_or_initialize_by(find_params)
-
-    submitter = Submitter.new(find_params) if submitter.submission&.completed_at? && submitter.viewer?
-
-    submitter.name = required_params['name'] if submitter.new_record?
-
-    unless @resubmit_submitter
-      required_params.each do |key, value|
-        submitter.errors.add(key.to_sym, :blank) if value.blank?
-      end
-    end
-
-    submitter
-  end
-
-  def assign_submission_attributes(submitter, template)
-    submitter.assign_attributes(
-      uuid: (filter_undefined_submitters(template).first || @template.submitters.first)['uuid'],
-      ip: request.remote_ip,
-      ua: request.user_agent,
-      values: @resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
-      preferences: @resubmit_submitter&.preferences.presence || { 'send_email' => true },
-      metadata: @resubmit_submitter&.metadata.presence || {}
-    )
-
-    submitter.assign_attributes(@resubmit_submitter.slice(:name, :email, :phone)) if @resubmit_submitter
-
-    if submitter.values.present?
-      @resubmit_submitter.attachments.each do |attachment|
-        submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
-      end
-    end
-
-    submitter.submission ||= Submission.new(template:,
-                                            account_id: template.account_id,
-                                            template_submitters: template.submitters,
-                                            expire_at: Templates.build_default_expire_at(template),
-                                            submitters: [submitter],
-                                            source: :link)
-
-    Submissions::CreateFromSubmitters.maybe_set_dynamic_documents(submitter.submission)
-
-    submitter.account_id = submitter.submission.account_id
-
-    submitter
-  end
-
-  def filter_undefined_submitters(template)
-    Templates.filter_undefined_submitters(template.submitters)
-  end
-
   def submitter_params
-    return { 'email' => current_user.email, 'name' => current_user.full_name } if params[:selfsign]
-    return @resubmit_submitter.slice(:name, :phone, :email) if @resubmit_submitter.present?
-
     params.require(:submitter).permit(:email, :phone, :name).tap do |attrs|
       attrs[:email] = Submissions.normalize_email(attrs[:email])
     end
   end
 
   def load_template
-    @template =
-      if @resubmit_submitter
-        @resubmit_submitter.template
-      else
-        Template.find_by!(slug: params[:slug] || params[:start_form_slug])
-      end
+    @template = Template.find_by!(slug: params[:slug] || params[:start_form_slug])
   end
 
   def multiple_submitters_error_message
@@ -224,38 +146,31 @@ class StartFormController < ApplicationController
     end
   end
 
-  def handle_require_2fa(submitter, is_new_record:)
+  def handle_require_2fa(template, submitter)
     return render :show, status: :unprocessable_content if submitter.errors.present?
 
-    is_otp_verified = Submitters.verify_link_otp!(params[:one_time_code], submitter)
-
-    if cookies.encrypted[:email_2fa_slug] == submitter.slug || is_otp_verified
-      if submitter.save
-        enqueue_new_submitter_jobs(submitter) if is_new_record
-
-        if is_otp_verified
-          SubmissionEvents.create_with_tracking_data(submitter, 'email_verified', request)
-
-          cookies.encrypted[:email_2fa_slug] =
-            { value: submitter.slug, expires: COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
-        end
-
-        redirect_to submit_form_path(submitter.slug)
-      else
-        render :show, status: :unprocessable_content
-      end
+    if Submitters::StartForm.verify_2fa_and_save_submitter(submitter, request, is_new_record: submitter.new_record?)
+      redirect_to submit_form_path(submitter.slug)
     else
+      if defined?(Rollbar) && template.preferences['shared_link_2fa'] != true
+        Rollbar.info("2FA link requested: #{submitter.id}")
+      end
+
       Submitters.send_shared_link_email_verification_code(submitter, request:)
 
       render :email_verification
     end
+  rescue Submitters::StartForm::NotSaved
+    render :show, status: :unprocessable_content
+  rescue Submitters::BouncedEmail => e
+    @error_message = e.message
+
+    render :error, status: :unprocessable_content
   rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e
-    redirect_to start_form_path(submitter.submission.template.slug,
-                                params: submitter_params.merge(email_verification: true)),
+    redirect_to start_form_path(template.slug, params: submitter_params.merge(email_verification: true)),
                 alert: e.message
   rescue RateLimit::LimitApproached
-    redirect_to start_form_path(submitter.submission.template.slug,
-                                params: submitter_params.merge(email_verification: true)),
+    redirect_to start_form_path(template.slug, params: submitter_params.merge(email_verification: true)),
                 alert: I18n.t(:too_many_attempts)
   end
 end

app/controllers/start_form_email_2fa_send_controller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class StartFormEmail2faSendController < ApplicationController
+  layout 'form'
+
   around_action :with_browser_locale
 
   skip_before_action :authenticate_user!
@@ -13,12 +15,20 @@ class StartFormEmail2faSendController < ApplicationController
     @submitter = @template.submissions.new(account_id: @template.account_id)
                           .submitters.new(**submitter_params, account_id: @template.account_id)
 
+    if @submitter.email.blank?
+      return redirect_to start_form_path(@template.slug), alert: I18n.t(:provide_your_email_to_start)
+    end
+
     Submitters.send_shared_link_email_verification_code(@submitter, request:)
 
     redir_params = { notice: I18n.t(:code_has_been_resent) } if params[:resend]
 
     redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)),
                 **redir_params
+  rescue Submitters::BouncedEmail => e
+    @error_message = e.message
+
+    render 'start_form/error', status: :unprocessable_content
   rescue Submitters::UnableToSendCode => e
     redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)),
                 alert: e.message
@@ -36,14 +46,24 @@ class StartFormEmail2faSendController < ApplicationController
     return redirect_to start_form_path(@template.slug) if is_archived
 
     return if (@template.shared_link? || (current_user && current_ability.can?(:read, @template))) &&
-              @template.preferences['shared_link_2fa'] == true
+              (@template.preferences['shared_link_2fa'] == true || submitter_exists?(@template, params))
 
-    Rollbar.warning("Not shared template: #{@template.id}") if defined?(Rollbar)
+    Rollbar.warning("Not 2FA shared template: #{@template.id}") if defined?(Rollbar)
 
     redirect_to start_form_path(@template.slug)
   end
 
+  def submitter_exists?(template, params)
+    email = Submissions.normalize_email(params.dig(:submitter, :email))
+
+    return false if email.blank?
+
+    Submitters::StartForm.build_submitters_scope(template, exclude_completed: true).exists?(email:)
+  end
+
   def submitter_params
-    params.require(:submitter).permit(:name, :email, :phone)
+    params.require(:submitter).permit(:name, :email, :phone).tap do |attrs|
+      attrs[:email] = Submissions.normalize_email(attrs[:email])
+    end
   end
 end

app/controllers/start_form_resubmit_controller.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+class StartFormResubmitController < ApplicationController
+  layout 'form'
+
+  skip_before_action :authenticate_user!
+  skip_authorization_check
+
+  around_action :with_browser_locale
+  before_action :load_resubmit_submitter
+  before_action :load_template
+  before_action :authorize_start!
+
+  def update
+    @submitter = find_or_initialize_submitter(@template, @resubmit_submitter)
+
+    if Templates.filter_undefined_submitters(@template.submitters).size > 1 && @submitter.new_record?
+      @error_message = multiple_submitters_error_message
+
+      return render 'start_form/show', status: :unprocessable_content
+    end
+
+    if (is_new_record = @submitter.new_record?)
+      Submitters::StartForm.assign_submission_attributes(
+        @submitter, @template,
+        ip: request.remote_ip, user_agent: request.user_agent, resubmit_submitter: @resubmit_submitter,
+        source: @resubmit_submitter.submission.source_self? ? :self : :link
+      )
+
+      Submissions::AssignDefinedSubmitters.call(@submitter.submission)
+    else
+      @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
+    end
+
+    if @template.preferences['shared_link_2fa'] == true
+      handle_require_2fa(@submitter)
+    elsif @submitter.save
+      Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
+
+      Submitters::StartForm.assign_start_form_cookie(@submitter, request)
+
+      redirect_to submit_form_path(@submitter.slug)
+    else
+      render 'start_form/show', status: :unprocessable_content
+    end
+  end
+
+  private
+
+  def find_or_initialize_submitter(template, resubmit_submitter)
+    Submitters::StartForm.build_submitters_scope(template, exclude_completed: true)
+                         .find_by(slug: cookies.encrypted[:start_form_slug],
+                                  email: resubmit_submitter.email) || Submitter.new
+  end
+
+  def load_resubmit_submitter
+    @resubmit_submitter = Submitter.find_by(slug: params[:resubmit])
+
+    raise ActiveRecord::RecordNotFound if @resubmit_submitter.blank? ||
+                                          !Submitters::StartForm.can_resubmit?(@resubmit_submitter)
+  end
+
+  def load_template
+    @template = @resubmit_submitter.template
+  end
+
+  def authorize_start!
+    redirect_to submit_form_path(@resubmit_submitter.slug) if @template.archived_at? || @template.account.archived_at?
+  end
+
+  def multiple_submitters_error_message
+    if current_user&.account_id == @template.account_id
+      helpers.t('this_submission_has_multiple_signers_which_prevents_the_use_of_a_sharing_link_html')
+    else
+      I18n.t('not_found')
+    end
+  end
+
+  def handle_require_2fa(submitter)
+    if Submitters::StartForm.verify_2fa_and_save_submitter(submitter, request,
+                                                           is_new_record: submitter.new_record?)
+      redirect_to submit_form_path(submitter.slug)
+    else
+      Submitters.send_shared_link_email_verification_code(submitter, request:)
+
+      render 'start_form/email_verification'
+    end
+  rescue Submitters::StartForm::NotSaved
+    render 'start_form/show', status: :unprocessable_content
+  rescue Submitters::BouncedEmail => e
+    @error_message = e.message
+
+    render 'start_form/error', status: :unprocessable_content
+  rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e
+    flash.now[:alert] = e.message
+
+    render 'start_form/email_verification'
+  rescue RateLimit::LimitApproached
+    flash.now[:alert] = I18n.t(:too_many_attempts)
+
+    render 'start_form/email_verification'
+  end
+end

app/controllers/start_form_self_controller.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class StartFormSelfController < ApplicationController
+  load_resource :template, parent: false
+
+  around_action :with_browser_locale
+  before_action :authorize_start!
+
+  def update
+    @submitter = Submitters::StartForm.build_submitters_scope(@template, exclude_completed: true, source: :self)
+                                      .find_or_initialize_by(email: current_user.email)
+
+    @submitter = Submitter.new(email: current_user.email) if @submitter.persisted? &&
+                                                             outdated_template_fields?(@submitter, @template)
+
+    if (is_new_record = @submitter.new_record?)
+      @submitter.name = current_user.full_name
+
+      Submitters::StartForm.assign_submission_attributes(
+        @submitter, @template, ip: request.remote_ip, user_agent: request.user_agent, source: :self
+      )
+
+      Submissions::AssignDefinedSubmitters.call(@submitter.submission)
+    else
+      @submitter.assign_attributes(ip: request.remote_ip, ua: request.user_agent)
+    end
+
+    @submitter.save!
+
+    Submitters::StartForm.enqueue_new_submitter_jobs(@submitter) if is_new_record
+
+    Submitters::StartForm.assign_start_form_cookie(@submitter, request)
+
+    redirect_to submit_form_path(@submitter.slug)
+  end
+
+  private
+
+  def outdated_template_fields?(submitter, template)
+    template_fields = submitter.submission.template_fields
+
+    template_fields.present? && template_fields != template.fields
+  end
+
+  def authorize_start!
+    authorize!(:read, @template)
+
+    redirect_to template_path(@template) if @template.archived_at?
+  end
+end

app/controllers/submit_form_completed_download_controller.rb

@@ -48,7 +48,7 @@ class SubmitFormCompletedDownloadController < ApplicationController
   private
 
   def submitter_slug
-    params[:submit_form_slug] || params[:submitter_slug] || params[:submitter_id]
+    params[:submit_form_slug] || params[:submitter_slug]
   end
 
   def respond_with_combined(submitter)

app/controllers/submit_form_controller.rb

@@ -107,6 +107,8 @@ class SubmitFormController < ApplicationController
     submitter_version = SubmitterVersion.find_by!(slug: params[:slug] || params[:submit_form_slug])
 
     @submitter = submitter_version.submitter
+
+    maybe_render_locked_page
   end
 
   private

app/controllers/submit_form_decline_controller.rb

@@ -19,7 +19,7 @@ class SubmitFormDeclineController < ApplicationController
                                                                                                 request)
 
     ApplicationRecord.transaction do
-      @submitter.update!(declined_at: Time.current)
+      @submitter.update!(declined_at: Time.current, values: @submitter.preferences['default_values'] || {})
 
       SubmissionEvents.create_with_tracking_data(@submitter, 'decline_form', request, { reason: params[:reason] })
     end

app/controllers/submit_form_email_2fas_controller.rb

@@ -8,9 +8,6 @@ class SubmitFormEmail2fasController < ApplicationController
 
   before_action :load_submitter
 
-  COOKIES_TTL = 12.hours
-  COOKIES_DEFAULTS = { httponly: true, secure: Rails.env.production? }.freeze
-
   def create
     RateLimit.call("verify-2fa-code-#{@submitter.id}", limit: 2, ttl: 45.seconds, enabled: true)
 
@@ -20,7 +17,8 @@ class SubmitFormEmail2fasController < ApplicationController
       SubmissionEvents.create_with_tracking_data(@submitter, 'email_verified', request, { email: @submitter.email })
 
       cookies.encrypted[:email_2fa_slug] =
-        { value: @submitter.slug, expires: COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
+        { value: @submitter.slug, expires: Submitters::StartForm::COOKIES_TTL.from_now,
+          **Submitters::StartForm::COOKIES_DEFAULTS }
 
       redirect_to submit_form_path(@submitter.slug)
     else
@@ -37,6 +35,12 @@ class SubmitFormEmail2fasController < ApplicationController
 
     RateLimit.call("send-email-code-#{@submitter.id}", limit: 2, ttl: 45.seconds, enabled: true)
 
+    if Docuseal.multitenant? && Submitters.email_bounced_recently?(@submitter.email)
+      Rollbar.warning("Bounced OTP email for submitter: #{@submitter.id}") if defined?(Rollbar)
+
+      return redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:verification_email_bounced)
+    end
+
     SendSubmitterVerificationEmailJob.perform_async('submitter_id' => @submitter.id, 'locale' => I18n.locale.to_s)
 
     redir_params = params[:resend] ? { alert: I18n.t(:code_has_been_resent) } : {}

app/controllers/templates_debug_controller.rb

@@ -13,9 +13,10 @@ class TemplatesDebugController < ApplicationController
       data = attachment.download
 
       unless attachment.image?
-        pdf = HexaPDF::Document.new(io: StringIO.new(data))
-
-        fields = Templates::FindAcroFields.call(pdf, attachment, data)
+        fields =
+          Pdfium::Document.open_io(StringIO.new(data)) do |doc|
+            Templates::FindPdfiumAcroFields.call(attachment, doc, data)
+          end
       end
 
       # fields, = Templates::DetectFields.call(StringIO.new(data), attachment:) if fields.blank?

app/controllers/templates_detect_fields_controller.rb

@@ -10,8 +10,14 @@ class TemplatesDetectFieldsController < ApplicationController
 
     sse = SSE.new(response.stream)
 
-    documents = @template.schema_documents.preload(:blob)
-    documents = documents.where(uuid: params[:attachment_uuid]) if params[:attachment_uuid].present?
+    documents =
+      if params[:attachment_uuid].present?
+        @template.documents.where(uuid: params[:attachment_uuid])
+      else
+        @template.schema_documents
+      end
+
+    documents = documents.preload(:blob)
 
     page_number = params[:page].presence&.to_i
 

app/controllers/templates_uploads_controller.rb

@@ -6,7 +6,9 @@ class TemplatesUploadsController < ApplicationController
   layout 'plain'
 
   def show
-    redirect_to root_path if params[:url].blank?
+    url_uri = Addressable::URI.parse(params[:url].to_s)
+
+    redirect_to root_path if url_uri.normalized_scheme != 'https' || url_uri.host.blank?
   end
 
   def create

app/controllers/testing_accounts_controller.rb

@@ -6,6 +6,7 @@ class TestingAccountsController < ApplicationController
   def create
     authorize!(:manage, current_account)
     authorize!(:manage, current_user)
+    authorize!(:manage, EncryptedConfig)
 
     impersonate_user(Accounts.find_or_create_testing_user(true_user.account))
 

app/controllers/verify_pdf_signature_controller.rb

@@ -4,16 +4,16 @@ class VerifyPdfSignatureController < ApplicationController
   skip_authorization_check
 
   def create
-    pdfs =
-      params[:files].map do |file|
-        HexaPDF::Document.new(io: file.open)
-      end
-
     trusted_certs = Accounts.load_trusted_certs(current_account)
 
+    signatures =
+      params[:files].map do |file|
+        VerifyPdfSignature.call(file.open, trusted_certs)
+      end
+
     render turbo_stream: turbo_stream.replace('result', partial: 'result',
-                                                        locals: { pdfs:, files: params[:files], trusted_certs: })
-  rescue HexaPDF::MalformedPDFError
+                                                        locals: { signatures:, files: params[:files] })
+  rescue Pdfium::PdfiumError
     render turbo_stream: turbo_stream.replace('result', html: helpers.tag.div(I18n.t('invalid_pdf'), id: 'result'))
   end
 end

app/javascript/submission_form/completed.vue

@@ -230,7 +230,7 @@ export default {
     download () {
       this.isDownloading = true
 
-      fetch(this.baseUrl + `/submitters/${this.submitterSlug}/download`, {
+      fetch(this.baseUrl + `/s/${this.submitterSlug}/documents`, {
         method: 'GET',
         ...this.fetchOptions
       }).then(async (response) => {

app/javascript/submission_form/form.vue

@@ -560,6 +560,7 @@
             :fields="formulaFields"
             :values="values"
             :readonly-values="readonlyFieldValues"
+            :fetch-options="fetchOptions"
             :provider="paymentProvider"
             @attached="attachments.push($event)"
             @focus="scrollIntoField(currentField)"
@@ -573,6 +574,7 @@
             :empty-value-required-step="emptyValueRequiredStep"
             :field="currentField"
             :submitter-slug="submitterSlug"
+            :fetch-options="fetchOptions"
             :values="values"
             @submit="!isSubmitting && submitStep()"
           />
@@ -585,6 +587,7 @@
             :empty-value-required-step="emptyValueRequiredStep"
             :field="currentField"
             :submitter-slug="submitterSlug"
+            :fetch-options="fetchOptions"
             :values="values"
             @focus="scrollIntoField(currentField)"
             @submit="!isSubmitting && submitStep()"
@@ -1776,7 +1779,7 @@ export default {
         window.location.href = sanitizeUrl(this.completedRedirectUrl)
       } else {
         this.$nextTick(() => {
-          const root = this.$root.$el.parentNode.getRootNode()
+          const root = this.$root.$el.parentNode?.getRootNode() || document
           const completedEl = root.getElementById('form_completed')
 
           if (completedEl) {

app/javascript/submission_form/kba_step.vue

@@ -312,6 +312,11 @@ export default {
     values: {
       type: Object,
       required: true
+    },
+    fetchOptions: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   emits: ['submit'],
@@ -494,8 +499,9 @@ export default {
 
         const resp = await fetch(this.baseUrl + '/api/kba', {
           method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(payload)
+          body: JSON.stringify(payload),
+          ...this.fetchOptions,
+          headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
         })
 
         const data = await resp.json()
@@ -550,7 +556,8 @@ export default {
             reference: this.reference,
             submitter_slug: this.submitterSlug
           }),
-          headers: { 'Content-Type': 'application/json' }
+          ...this.fetchOptions,
+          headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
         })
 
         const data = await resp.json()

app/javascript/submission_form/payment_step.vue

@@ -121,6 +121,11 @@ export default {
       type: String,
       required: false,
       default: ''
+    },
+    fetchOptions: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   emits: ['focus', 'submit', 'update:model-value', 'attached'],
@@ -234,7 +239,8 @@ export default {
           body: JSON.stringify({
             submitter_slug: this.submitterSlug
           }),
-          headers: { 'Content-Type': 'application/json' }
+          ...this.fetchOptions,
+          headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
         }).then(async (resp) => {
           if (resp.status === 422 || resp.status === 500) {
             this.isProcessing = false
@@ -274,7 +280,8 @@ export default {
           check_status: checkStatus,
           referer: this.normalizedPaymentUrl()
         }),
-        headers: { 'Content-Type': 'application/json' }
+        ...this.fetchOptions,
+        headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
       }).then(async (resp) => {
         if (resp.status === 422 || resp.status === 500) {
           const data = await resp.json()

app/javascript/submission_form/verification_step.vue

@@ -91,6 +91,11 @@ export default {
     submitterSlug: {
       type: String,
       required: true
+    },
+    fetchOptions: {
+      type: Object,
+      required: false,
+      default: () => ({})
     }
   },
   emits: ['focus', 'submit', 'update:model-value', 'attached'],
@@ -163,7 +168,8 @@ export default {
           submitter_slug: this.submitterSlug,
           redirect_url: document.location.href
         }),
-        headers: { 'Content-Type': 'application/json' }
+        ...this.fetchOptions,
+        headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
       }).then(async (resp) => {
         this.eidEasyData = await resp.json()
 
@@ -205,7 +211,8 @@ export default {
         body: JSON.stringify({
           submitter_slug: this.submitterSlug
         }),
-        headers: { 'Content-Type': 'application/json' }
+        ...this.fetchOptions,
+        headers: { 'Content-Type': 'application/json', ...this.fetchOptions.headers }
       })
 
       if (resp.status === 404) {

app/javascript/template_builder/builder.vue

@@ -110,7 +110,7 @@
             data-turbo="false"
             class="inline"
             method="post"
-            :action="`/d/${template.slug}`"
+            :action="`/start_form_self/${template.id}`"
             @submit="maybeShowErrorTemplateAlert"
           >
             <input
@@ -125,12 +125,6 @@
               :value="authenticityToken"
               autocomplete="off"
             >
-            <input
-              type="hidden"
-              name="selfsign"
-              value="true"
-              autocomplete="off"
-            >
             <button
               class="btn btn-primary btn-ghost text-base hidden md:flex"
               type="submit"
@@ -3531,6 +3525,8 @@ export default {
         this.onChange(this.template)
       }
 
+      this.pushUndo()
+
       if (!this.autosave && !force) {
         return Promise.resolve({})
       }
@@ -3541,8 +3537,6 @@ export default {
         }
       })
 
-      this.pushUndo()
-
       return this.baseFetch(`/templates/${this.template.id}`, {
         method: 'PUT',
         body: JSON.stringify({

app/javascript/template_builder/fields.vue

@@ -555,8 +555,10 @@ export default {
       return this.template.schema.some((item) => item.dynamic)
     },
     numberOfPages () {
-      return this.template.documents.reduce((acc, doc) => {
-        return acc + doc.metadata?.pdf?.number_of_pages || doc.preview_images.length
+      return this.template.schema.reduce((acc, item) => {
+        const doc = this.template.documents.find((d) => d.uuid === item.attachment_uuid)
+
+        return acc + (doc?.metadata?.pdf?.number_of_pages || doc?.preview_images?.length || 0)
       }, 0)
     },
     isShowFieldSearch () {
@@ -774,9 +776,10 @@ export default {
         headers: {
           'Content-Type': 'application/json'
         },
-        ...(this.withDetectExistingFields
-          ? { body: JSON.stringify({ fields: this.buildExistingFields() }) }
-          : {})
+        body: JSON.stringify({
+          attachment_uuid: this.template.schema.map((item) => item.attachment_uuid),
+          ...(this.withDetectExistingFields ? { fields: this.buildExistingFields() } : {})
+        })
       }).then(async (response) => {
         const reader = response.body.getReader()
         const decoder = new TextDecoder('utf-8')

app/javascript/template_builder/import_list.vue

@@ -366,6 +366,9 @@ export default {
       }
     }
   },
+  beforeUnmount () {
+    document.getElementById('list_form_buttons')?.classList?.add('hidden')
+  },
   methods: {
     t (key) {
       return this.i18n[key] || key

app/jobs/generate_preview_images_job.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class GeneratePreviewImagesJob
-  include Sidekiq::Job
-
-  sidekiq_options queue: :images
-
-  def perform(params = {})
-    attachment = ActiveStorage::Attachment.find(params['attachment_id'])
-
-    max_page = [attachment.metadata['pdf']['number_of_pages'].to_i - 1,
-                Templates::ProcessDocument::MAX_NUMBER_OF_PAGES_PROCESSED].min
-
-    Templates::ProcessDocument.generate_document_preview_images(attachment, attachment.download, 1..max_page,
-                                                                concurrency: 1)
-  end
-end

app/jobs/process_submitter_completion_job.rb

@@ -123,13 +123,18 @@ class ProcessSubmitterCompletionJob
 
     user = submission.created_by_user || template.author
 
+    copy_email_configs = AccountConfigs.find_or_initialize_for_key(submitter.account,
+                                                                   AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY)
+
+    is_copy_email_enabled = documents_copy_email_enabled?(submitter, copy_email_configs)
+
     if submitter.account.users.exists?(id: user.id) && submission.preferences['send_email'] != false &&
        (!template || template.preferences['completed_notification_email_enabled'] != false)
       user_submitter = submission.submitters.find { |s| s.email == user.email }
 
       is_sent_to_user =
         if user.role != 'integration' &&
-           (!user_submitter || user_submitter.preferences['send_email'] == false) &&
+           (!user_submitter || user_submitter.preferences['send_email'] == false || !is_copy_email_enabled) &&
            user.user_configs.find_by(key: UserConfig::RECEIVE_COMPLETED_EMAIL)&.value != false
           SubmitterMailer.completed_email(submitter, user).deliver_later!
 
@@ -139,11 +144,11 @@ class ProcessSubmitterCompletionJob
       enqueue_bcc_completed_emails(submitter, user, is_sent_to_user)
     end
 
-    maybe_enqueue_copy_emails(submitter)
+    enqueue_copy_emails(submitter, copy_email_configs) if is_copy_email_enabled
   end
 
   def enqueue_bcc_completed_emails(submitter, user, is_sent_to_user)
-    bcc_addresses = build_bcc_addresses(submitter.submission)
+    bcc_addresses = build_bcc_addresses(submitter.submission).uniq
 
     raise TooManyBcc, submitter.account_id if Docuseal.multitenant? && bcc_addresses.size > BCC_LIMIT
 
@@ -154,14 +159,13 @@ class ProcessSubmitterCompletionJob
     end
   end
 
-  def maybe_enqueue_copy_emails(submitter)
-    return if submitter.template&.preferences&.dig('documents_copy_email_enabled') == false
+  def documents_copy_email_enabled?(submitter, configs)
+    return false if submitter.template&.preferences&.dig('documents_copy_email_enabled') == false
 
-    configs = AccountConfigs.find_or_initialize_for_key(submitter.account,
-                                                        AccountConfig::SUBMITTER_DOCUMENTS_COPY_EMAIL_KEY)
-
-    return if configs.value['enabled'] == false
+    configs.value['enabled'] != false
+  end
 
+  def enqueue_copy_emails(submitter, configs)
     to = submitter.submission.submitters.reject { |e| e.preferences['send_email'] == false }
                   .sort_by { |e| e.completed_at || Time.current }.select(&:email?).map(&:friendly_name)
 

app/models/email_message.rb

@@ -31,6 +31,8 @@ class EmailMessage < ApplicationRecord
 
   attribute :uuid, :string, default: -> { SecureRandom.uuid }
 
+  normalizes :body, with: ->(value) { value.to_s }, apply_to_nil: true
+
   before_validation :set_sha1, on: :create
 
   def normalized_body

app/models/submission.rb

@@ -112,7 +112,8 @@ class Submission < ApplicationRecord
     api: 'api',
     embed: 'embed',
     mcp: 'mcp',
-    link: 'link'
+    link: 'link',
+    self: 'self'
   }, scope: false, prefix: true
 
   enum :submitters_order, {

app/views/notifications_settings/index.html.erb

@@ -21,13 +21,15 @@
       <% end %>
     </div>
     <%= render 'bcc_form', config: @bcc_config %>
-    <div class="flex justify-between items-end mb-4 mt-8">
-      <h2 class="text-2xl md:text-3xl font-bold">
-        <%= t('sign_request_email_reminders') %>
-      </h2>
-    </div>
-    <%= render 'reminder_banner' %>
-    <%= render 'reminder_form', config: @reminder_config %>
+    <% unless can?(:manage, :personalization_restricted) %>
+      <div class="flex justify-between items-end mb-4 mt-8">
+        <h2 class="text-2xl md:text-3xl font-bold">
+          <%= t('sign_request_email_reminders') %>
+        </h2>
+      </div>
+      <%= render 'reminder_banner' %>
+      <%= render 'reminder_form', config: @reminder_config %>
+    <% end %>
   </div>
   <div class="w-0 md:w-52"></div>
 </div>

app/views/personalization_settings/_documents_copy_email_form.html.erb

@@ -10,7 +10,12 @@
       <%= f.hidden_field :key %>
       <%= f.fields_for :value, Struct.new(:subject, :body, :reply_to, :attach_audit_log, :attach_documents, :bcc_recipients, :enabled).new(*f.object.value.values_at('subject', 'body', 'reply_to', 'attach_audit_log', 'attach_documents', 'bcc_recipients', 'enabled')) do |ff| %>
         <div class="form-control">
-          <%= ff.label :subject, t('subject'), class: 'label' %>
+          <div class="flex items-center">
+            <%= ff.label :subject, t('subject'), class: 'label' %>
+            <span class="tooltip tooltip-right" data-tip="<%= t('completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents') %>">
+              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+            </span>
+          </div>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
         <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>

app/views/personalization_settings/_signature_request_email_form.html.erb

@@ -10,7 +10,12 @@
       <%= f.hidden_field :key %>
       <%= f.fields_for :value, Struct.new(:subject, :body, :reply_to).new(*f.object.value.values_at('subject', 'body', 'reply_to')) do |ff| %>
         <div class="form-control">
-          <%= ff.label :subject, t('subject'), class: 'label' %>
+          <div class="flex items-center">
+            <%= ff.label :subject, t('subject'), class: 'label' %>
+            <span class="tooltip tooltip-right" data-tip="<%= t('signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign') %>">
+              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+            </span>
+          </div>
           <%= ff.text_field :subject, required: true, class: 'base-input', dir: 'auto' %>
         </div>
         <%= render 'personalization_settings/email_body_field', ff:, config: f.object %>

app/views/personalization_settings/_submitter_completed_email_form.html.erb

@@ -12,7 +12,7 @@
         <div class="form-control">
           <div class="flex items-center">
             <%= ff.label :subject, t('subject'), class: 'label' %>
-            <span class="tooltip" data-tip="<%= t('use_following_placeholders_text_') %> <%= AccountConfig::EMAIL_VARIABLES[AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY].map { |v| "{#{v}}" }.join(', ') %>">
+            <span class="tooltip tooltip-right" data-tip="<%= t('notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties') %> <%= t('use_following_placeholders_text_') %> <%= AccountConfig::EMAIL_VARIABLES[AccountConfig::SUBMITTER_COMPLETED_EMAIL_KEY].map { |v| "{#{v}}" }.join(', ') %>">
               <%= svg_icon('info_circle', class: 'w-4 h-4') %>
             </span>
           </div>

app/views/start_form/completed.html.erb

@@ -2,7 +2,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="flex items-center justify-center">
-        <%= render 'banner' %>
+        <%= render 'start_form/banner' %>
       </div>
       <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
         <div class="flex items-center">
@@ -26,7 +26,7 @@
         <%= button_to button_title(title: t('send_copy_to_email'), disabled_with: t('sending'), icon: svg_icon('mail_forward', class: 'w-6 h-6')), send_submission_email_index_path, params: { template_slug: @template.slug, email: params[:email] }, class: 'base-button w-full' %>
       </toggle-submit>
     <% end %>
-    <% if Templates.filter_undefined_submitters(@template.submitters).size == 1 && %w[api embed mcp].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && @template.shared_link? %>
+    <% if @template.shared_link? && Templates.filter_undefined_submitters(@template.submitters).size == 1 && %w[api embed mcp].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false %>
       <toggle-submit class="block">
         <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), start_form_path(@template.slug), params: { submitter: params.permit(:name, :email, :phone).compact_blank, resubmit: true }, method: :put, class: 'white-button w-full' %>
       </toggle-submit>

app/views/start_form/email_verification.html.erb

@@ -23,12 +23,12 @@
     <div>
       <%= t('we_sent_a_one_time_verification_code_to_your_email_address_please_enter_the_code_below_to_continue') %>
     </div>
-    <%= form_for '', url: start_form_path(@template.slug), method: :put, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
+    <%= form_for '', url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), method: :put, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
       <div dir="auto" class="form-control !mt-0">
         <%= f.hidden_field 'resubmit', value: params[:resubmit] %>
-        <%= f.hidden_field 'submitter[name]', value: params[:name] || @submitter&.name %>
-        <%= f.hidden_field 'submitter[email]', value: params[:email] || @submitter&.email %>
-        <%= f.hidden_field 'submitter[phone]', value: params[:phone] || @submitter&.phone %>
+        <%= f.hidden_field 'submitter[name]', value: params[:name] || params.dig(:submitter, :name) %>
+        <%= f.hidden_field 'submitter[email]', value: params[:email] || params.dig(:submitter, :email) %>
+        <%= f.hidden_field 'submitter[phone]', value: params[:phone] || params.dig(:submitter, :phone) %>
         <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
         <div class="flex justify-between items-center mt-1">
           <span>
@@ -49,6 +49,10 @@
         <%= f.button button_title(title: t('submit')), class: 'base-button' %>
       </toggle-submit>
     <% end %>
-    <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || @submitter&.name, email: params[:email] || @submitter&.email, phone: params[:phone] || @submitter&.phone } }.compact, method: :post, id: 'resend_code', class: 'hidden' %>
+    <% if @resubmit_submitter %>
+      <%= button_to t(:re_send_email), resubmit_form_path, params: { resubmit: @resubmit_submitter.slug }, method: :put, id: 'resend_code', class: 'hidden' %>
+    <% else %>
+      <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) } }.compact, method: :post, id: 'resend_code', class: 'hidden' %>
+    <% end %>
   </div>
 </main>

app/views/start_form/error.html.erb

@@ -0,0 +1,31 @@
+<% content_for(:html_title, "#{@template.name} | DocuSeal") %>
+<% I18n.with_locale(@template.account.locale) do %>
+  <% content_for(:html_description, t('account_name_has_invited_you_to_fill_and_sign_documents_online_effortlessly_with_a_secure_fast_and_user_friendly_digital_document_signing_solution', account_name: @template.account.name)) %>
+<% end %>
+<main class="max-w-md mx-auto px-2 mt-12 mb-4">
+  <div class="space-y-6 mx-auto">
+    <div class="space-y-6">
+      <div class="flex items-center justify-center">
+        <%= render 'start_form/banner' %>
+      </div>
+      <div class="flex items-center bg-base-200 rounded-xl p-4 mb-4">
+        <div class="flex items-center">
+          <div class="mr-3">
+            <%= svg_icon('writing_sign', class: 'w-10 h-10') %>
+          </div>
+          <div>
+            <p class="text-lg font-bold mb-1"><%= @template.name %></p>
+            <p dir="auto" class="text-sm"><%= t('invited_by_html', name: @template.account.name) %></p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="alert items-start bg-base-100 border border-base-300">
+      <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %>
+      <div class="text-sm"><%= @error_message %></div>
+    </div>
+    <div dir="auto" class="form-control">
+      <%= link_to t('back'), @resubmit_submitter ? submit_form_path(@resubmit_submitter.slug) : start_form_path(@template.slug, @submitter.slice(:name, :email, :phone).compact_blank), class: 'base-button' %>
+    </div>
+  </div>
+</main>

app/views/start_form/private.html.erb

@@ -4,7 +4,7 @@
 <% end %>
 <main class="max-w-md space-y-6 mx-auto px-2 mt-12 mb-4">
   <div class="text-center w-full space-y-6">
-    <%= render 'banner' %>
+    <%= render 'start_form/banner' %>
     <p class="text-xl font-semibold text-center">
       <%= t('share_link_is_currently_disabled') %>
     </p>

app/views/start_form/show.html.erb

@@ -6,7 +6,7 @@
   <div class="space-y-6 mx-auto">
     <div class="space-y-6">
       <div class="text-center w-full space-y-6">
-        <%= render 'banner' %>
+        <%= render 'start_form/banner' %>
         <% unless @template.archived_at? %>
           <p class="text-xl font-semibold text-center"><%= t('you_have_been_invited_to_submit_a_form') %></p>
         <% end %>
@@ -28,7 +28,8 @@
       </div>
     </div>
     <% if !@template.archived_at? && !@template.account.archived_at? %>
-      <%= form_for @submitter, url: start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
+      <%= form_for @submitter, url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %>
+        <%= hidden_field_tag :resubmit, @resubmit_submitter.slug if @resubmit_submitter %>
         <% if @error_message %>
           <div class="alert items-start bg-base-100 border border-red-400 text-red-400">
             <%= svg_icon('info_circle', class: 'stroke-current shrink-0 h-6 w-6 mt-1') %>

app/views/submissions_archived/index.html.erb

@@ -17,7 +17,7 @@
     </div>
   </div>
   <div class="flex items-center md:items-end gap-2">
-    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
+    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true, with_default_status: true %>
     <%= render 'submissions_filters/filter_button', filter_params: %>
   </div>
 </div>

app/views/submissions_filters/_applied_filters.html.erb

@@ -3,15 +3,16 @@
 <% ordered_filters = request.query_parameters.keys.filter_map { |key| filter_names.find { |name| key.start_with?(name) } }.uniq %>
 <% chip_order = ordered_filters.reverse.each_with_index.to_h { |name, index| [name, index + 1] } %>
 <% chip_order.default = ordered_filters.size + 1 %>
-<% status_icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
 <% status_icons = { 'all' => 'list', 'pending' => 'clock', 'completed' => 'circle_check' } %>
 <% current_status = status_icons.key?(params[:status].to_s) ? params[:status].to_s : 'all' %>
+<% status_icon = { 'declined' => 'x_circle', 'expired' => 'clock_cancel', 'partially_completed' => 'clock_edit', 'sent' => 'send', 'opened' => 'mail_opened' }[params[:status]] %>
+<% default_status_icon = status_icons[params[:status]] if status_icon.blank? && local_assigns[:with_default_status] && current_status != 'all' %>
 <% with_status_button = local_assigns[:with_status] && status_icon.blank? %>
-<% chips_html = capture do %>
-  <% if status_icon %>
-    <div class="order-none flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700">
+<% status_chip_html = capture do %>
+  <% if status_icon || default_status_icon %>
+    <div class="order-none flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700 <%= 'max-md:hidden' if default_status_icon %>">
       <%= link_to submissions_filter_path('status', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
-        <%= svg_icon(status_icon, class: 'w-5 h-5 shrink-0') %>
+        <%= svg_icon(status_icon || default_status_icon, class: 'w-5 h-5 shrink-0') %>
         <span class="font-normal truncate"><%= t(params[:status]) %></span>
       <% end %>
       <%= link_to url_for(params: request.query_parameters.except('status')), class: 'rounded-lg ml-1 shrink-0 hover:bg-base-content hover:text-white' do %>
@@ -19,6 +20,8 @@
       <% end %>
     </div>
   <% end %>
+<% end %>
+<% chips_html = capture do %>
   <% if params[:folder].present? %>
     <div class="order-<%= chip_order['folder'] %> md:order-none md:tooltip tooltip-no-touch tooltip-bottom flex md:flex h-10 px-2 py-1 text-base md:text-lg items-center justify-between border text-center text-neutral font-semibold rounded-xl shrink-0 max-w-[60vw] md:w-36 border-neutral-700" data-tip="<%= t('folder') %>">
       <%= link_to submissions_filter_path('folder', query_params.merge(path: url_for, with_remove: true)), data: { turbo_frame: 'modal' }, class: 'flex items-center space-x-1 flex-1 min-w-0 pr-1' do %>
@@ -78,7 +81,8 @@
     </div>
   <% end %>
 <% end %>
-<% if with_status_button && chips_html.blank? %>
+<% with_status_dropdown = with_status_button && chips_html.blank? %>
+<% if with_status_dropdown %>
   <div class="dropdown md:hidden shrink-0">
     <label tabindex="0" class="cursor-pointer flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
       <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
@@ -122,15 +126,16 @@
     </ul>
   </div>
 <% end %>
-<% if chips_html.present? %>
-  <scroll-fade class="flex items-center gap-2 overflow-x-auto flex-1 min-w-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden [&::-webkit-scrollbar]:h-0 [&::-webkit-scrollbar]:w-0 md:contents">
-    <% if with_status_button %>
+<% if chips_html.present? || status_chip_html.present? %>
+  <scroll-fade class="flex items-center gap-2 overflow-x-auto flex-1 min-w-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden [&::-webkit-scrollbar]:h-0 [&::-webkit-scrollbar]:w-0 md:contents <%= 'max-md:hidden' if with_status_dropdown %>">
+    <% if with_status_button && !with_status_dropdown %>
       <a href="<%= submissions_filter_path('status', query_params.merge(path: url_for)) %>" data-turbo-frame="modal" class="order-none md:hidden flex h-10 px-2 py-1 space-x-1 text-base items-center border text-neutral rounded-xl shrink-0 <%= current_status == 'all' ? 'border-neutral-300' : 'border-neutral-700' %>">
         <%= svg_icon(status_icons[current_status], class: 'w-5 h-5 shrink-0') %>
         <span><%= t(current_status) %></span>
         <%= svg_icon('chevron_down', class: 'w-4 h-4 shrink-0') %>
       </a>
     <% end %>
+    <%= status_chip_html %>
     <%= chips_html %>
   </scroll-fade>
 <% end %>

app/views/submissions_filters/_filter_modal.html.erb

@@ -1,5 +1,7 @@
+<% path_uri = Addressable::URI.parse(params[:path].to_s) %>
+<% path = url_for(**Rails.application.routes.recognize_path(path_uri.path, method: :get)) %>
 <%= render 'shared/turbo_modal', title: local_assigns[:title] do %>
-  <%= form_for '', url: params[:path], method: :get, data: { turbo_frame: :_top }, html: { autocomplete: :off } do |f| %>
+  <%= form_for '', url: path, method: :get, data: { turbo_frame: :_top }, html: { autocomplete: :off } do |f| %>
     <%= hidden_field_tag :q, params[:q] if params[:q].present? %>
     <% local_assigns[:default_params].each do |key, value| %>
       <%= hidden_field_tag(key, value) if value.present? %>
@@ -10,7 +12,7 @@
     </div>
     <% if params[:with_remove] %>
       <div class="text-center w-full mt-4">
-        <%= link_to t('remove_filter'), "#{params[:path]}?#{request.query_parameters.slice('q').merge(local_assigns[:default_params]).to_query}", class: 'link', data: { turbo_frame: :_top } %>
+        <%= link_to t('remove_filter'), "#{path}?#{request.query_parameters.slice('q').merge(local_assigns[:default_params]).to_query}", class: 'link', data: { turbo_frame: :_top } %>
       </div>
     <% end %>
   <% end %>

app/views/submit_form/completed.html.erb

@@ -44,7 +44,7 @@
       <% end %>
     </div>
     <% undefined_submitters = Templates.filter_undefined_submitters(@submitter.submission.template_submitters) %>
-    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && @submitter.completed_at? && @submitter.completed_at > 14.days.ago && %w[api embed mcp].exclude?(@submitter.submission.source) && @submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false && @submitter.template && !@submitter.template.archived_at? %>
+    <% if undefined_submitters.size == 1 && undefined_submitters.first['uuid'] == @submitter.uuid && Submitters::StartForm.can_resubmit?(@submitter) && @submitter.template && !@submitter.template.archived_at? %>
       <div class="divider uppercase"><%= t('or') %></div>
       <toggle-submit class="block">
         <%= button_to button_title(title: t('resubmit'), disabled_with: t('resubmit'), icon: svg_icon('reload', class: 'w-6 h-6')), resubmit_form_path, params: { resubmit: @submitter.slug }, method: :put, class: 'white-button w-full' %>

app/views/templates/_title.html.erb

@@ -64,8 +64,12 @@
     <% end %>
   </div>
   <div class="flex flex-wrap gap-2 w-full md:w-fit md:justify-between md:flex-none md:pt-1">
-    <% if !template.archived_at? && can?(:destroy, template) %>
-      <%= button_to button_title(title: t('archive'), disabled_with: t('archiving')[..-4], title_class: 'inline', icon: svg_icon('archive', class: 'w-6 h-6')), template_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1', method: :delete %>
+    <% if can?(:destroy, template) %>
+      <% if template.archived_at? %>
+        <%= button_to button_title(title: t('restore'), disabled_with: t('restoring')[..-4], icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1' %>
+      <% else %>
+        <%= button_to button_title(title: t('archive'), disabled_with: t('archiving')[..-4], title_class: 'inline', icon: svg_icon('archive', class: 'w-6 h-6')), template_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1', method: :delete %>
+      <% end %>
     <% end %>
     <% if can?(:create, current_account.templates.new(author: current_user)) %>
       <div class="flex-1">
@@ -99,9 +103,6 @@
       <% end %>
     <% end %>
     <% if template.archived_at? %>
-      <% if can?(:destroy, template) %>
-        <%= button_to button_title(title: t('restore'), disabled_with: t('restoring')[..-4], icon: svg_icon('rotate', class: 'w-6 h-6')), template_restore_index_path(template), class: 'btn btn-outline btn-sm w-full', form_class: 'flex-1' %>
-      <% end %>
       <div class="flex-1">
         <%= link_to template_preview_path(template), class: 'btn btn-outline btn-sm w-full' do %>
           <span class="flex items-center justify-center space-x-2">

app/views/templates/show.html.erb

@@ -99,7 +99,7 @@
                 </open-modal-mobile>
               <% end %>
               <% if Templates.filter_undefined_submitters(@template.submitters).size == 1 && @template.variables_schema.blank? %>
-                <%= button_to start_form_path(@template.slug), params: { selfsign: true }, method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: '_blank', data: { turbo: false } } do %>
+                <%= button_to start_form_self_path(@template), method: :put, class: 'white-button w-full', form: { style: 'display: inline', target: '_blank', data: { turbo: false } } do %>
                   <%= svg_icon('writing', class: 'w-6 h-6') %>
                   <span class="mr-1"><%= t('sign_it_yourself') %></span>
                 <% end %>

app/views/templates_archived_submissions/index.html.erb

@@ -19,7 +19,7 @@
     </div>
   </div>
   <div class="flex flex-nowrap md:flex-wrap md:justify-end items-center gap-2">
-    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true %>
+    <%= render 'submissions_filters/applied_filters', filter_params:, with_status: true, with_default_status: true %>
     <div class="hidden md:block shrink-0 md:order-first">
       <%= link_to new_template_submissions_export_path(@template, archived: true), class: 'btn btn-ghost text-base h-10 min-h-10', data: { turbo_frame: 'modal' } do %>
         <%= svg_icon('download', class: 'w-6 h-6 stroke-2') %>

app/views/templates_preferences/_submitter_completed_email_form.html.erb

@@ -10,7 +10,12 @@
     <%= f.fields_for :preferences, Struct.new(:completed_notification_email_subject, :completed_notification_email_body).new(@template.preferences['completed_notification_email_subject'].presence || configs['subject'], @template.preferences['completed_notification_email_body'].presence || configs['body']) do |ff| %>
       <div class="form-control">
         <div class="flex justify-between">
-          <%= ff.label :completed_notification_email_subject, t('email_subject'), class: 'label' %>
+          <div class="flex items-center">
+            <%= ff.label :completed_notification_email_subject, t('email_subject'), class: 'label' %>
+            <span class="tooltip tooltip-right" data-tip="<%= t('notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties') %>">
+              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+            </span>
+          </div>
           <% if is_custom_template_email %>
             <label for="submitter_completed_email_reset_link" class="label underline">
               <%= t('reset_default') %>

app/views/templates_preferences/_submitter_documents_copy_email_form.html.erb

@@ -10,7 +10,12 @@
     <%= f.fields_for :preferences, Struct.new(:documents_copy_email_reply_to, :documents_copy_email_subject, :documents_copy_email_body).new(@template.preferences['documents_copy_email_reply_to'].presence || configs['reply_to'], @template.preferences['documents_copy_email_subject'].presence || configs['subject'], @template.preferences['documents_copy_email_body'].presence || configs['body']) do |ff| %>
       <div class="form-control">
         <div class="flex justify-between">
-          <%= ff.label :documents_copy_email_subject, t('email_subject'), class: 'label' %>
+          <div class="flex items-center">
+            <%= ff.label :documents_copy_email_subject, t('email_subject'), class: 'label' %>
+            <span class="tooltip tooltip-right" data-tip="<%= t('completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents') %>">
+              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+            </span>
+          </div>
           <% if is_custom_template_email %>
             <label for="submitter_documents_copy_email_reset_link" class="label underline">
               <%= t('reset_default') %>

app/views/templates_preferences/_submitter_invitation_email_form.html.erb

@@ -16,7 +16,12 @@
       <%= f.fields_for :preferences, Struct.new(:request_email_subject, :request_email_body).new(*(template_email_preferences_values.presence || default_template_email_preferences_values)) do |ff| %>
         <div class="form-control">
           <div class="flex justify-between">
-            <%= ff.label :request_email_subject, t('email_subject'), class: 'label' %>
+            <div class="flex items-center">
+              <%= ff.label :request_email_subject, t('email_subject'), class: 'label' %>
+              <span class="tooltip tooltip-right" data-tip="<%= t('signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign') %>">
+                <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+              </span>
+            </div>
             <% if is_custom_template_email %>
               <label for="submitter_invitation_email_reset_link" class="label underline">
                 <%= t('reset_default') %>

app/views/templates_preferences/_submitter_view_invitation_email_form.html.erb

@@ -10,7 +10,12 @@
     <%= f.fields_for :preferences, Struct.new(:invitation_view_email_subject, :invitation_view_email_body).new(@template.preferences['invitation_view_email_subject'].presence || configs['subject'], @template.preferences['invitation_view_email_body'].presence || configs['body']) do |ff| %>
       <div class="form-control">
         <div class="flex justify-between">
-          <%= ff.label :invitation_view_email_subject, t('email_subject'), class: 'label' %>
+          <div class="flex items-center">
+            <%= ff.label :invitation_view_email_subject, t('email_subject'), class: 'label' %>
+            <span class="tooltip tooltip-right" data-tip="<%= t('view_only_email_sent_to_recipients_that_need_to_only_review_the_documents') %>">
+              <%= svg_icon('info_circle', class: 'w-4 h-4') %>
+            </span>
+          </div>
           <% if is_custom_template_email %>
             <label for="submitter_view_invitation_email_reset_link" class="label underline">
               <%= t('reset_default') %>

app/views/verify_pdf_signature/_result.html.erb

@@ -1,7 +1,7 @@
 <div id="result">
-  <% files.zip(pdfs).each do |file, pdf| %>
+  <% files.zip(signatures).each do |file, file_signatures| %>
     <div class="mb-4 border border-base-300 rounded-md py-2 px-3">
-      <% if pdf.signatures.to_a.size == 0 %>
+      <% if file_signatures.size == 0 %>
         <div class="text-sm">
           <%= file.original_filename %>
         </div>
@@ -11,42 +11,29 @@
       <% else %>
         <div class="flex items-center space-x-1 border-b border-dashed border-base-300 pb-2">
           <%= svg_icon('file_text', class: 'w-5 h-5 inline') %>
-          <span><%= file.original_filename %> - <%= pluralize(pdf.signatures.to_a.size, 'Signature') %></span>
+          <span><%= file.original_filename %> - <%= pluralize(file_signatures.size, 'Signature') %></span>
         </div>
-        <% pdf.signatures.to_a.each do |signature| %>
+        <% file_signatures.each do |signature| %>
           <div class="mt-3">
             <div class="space-y-1 font-medium pb-2 text-xl">
-              <% signature.verify(trusted_certs:).messages.map(&:content).each do |message| %>
+              <% signature.messages.each do |message| %>
                 <p class="flex space-x-1 items-center">
-                  <% if message == 'Signature verification failed' %>
+                  <% if message.status == :error %>
                     <%= svg_icon('x_circle', class: 'w-6 h-6 text-red-500') %>
-                  <% elsif message == 'Signature valid' %>
+                  <% elsif message.status == :success %>
                     <%= svg_icon('circle_check', class: 'w-6 h-6 text-green-500') %>
+                  <% elsif message.status == :warning %>
+                    <%= svg_icon('alert_circle', class: 'w-6 h-6 text-yellow-500') %>
                   <% end %>
                   <span>
-                    <%= message %>
+                    <%= message.text %>
                   </span>
                 </p>
-                <% if message == 'Signature valid' %>
-                  <p class="flex space-x-1 items-center">
-                    <% if trusted_certs.any? { |e| e.public_key.to_der == signature.signature_handler.signer_certificate.public_key.to_der } %>
-                      <%= svg_icon('circle_check', class: 'w-6 h-6 text-green-500') %>
-                      <span>
-                        <%= t('signed_with_trusted_certificate') %>
-                      </span>
-                    <% else %>
-                      <%= svg_icon('x_circle', class: 'w-6 h-6 text-red-500') %>
-                      <span>
-                        <%= t('signed_with_external_certificate') %>
-                      </span>
-                    <% end %>
-                  </p>
-                <% end %>
               <% end %>
             </div>
             <div class="flex items-center space-x-1">
               <%= svg_icon('user', class: 'w-5 h-5 inline') %>
-              <span><%= signature.signing_reason %></span>
+              <span><%= signature.reason %></span>
             </div>
             <div class="flex items-center space-x-1">
               <%= svg_icon('calendar', class: 'w-5 h-5 inline') %>
@@ -54,11 +41,11 @@
             </div>
             <div class="flex items-center space-x-1">
               <%= svg_icon('certificate', class: 'w-5 h-5 inline') %>
-              <span><%= signature.signer_name.force_encoding('UTF-8') %></span>
+              <span><%= signature.common_name %></span>
             </div>
             <div class="flex items-center space-x-1">
               <%= svg_icon('lock_access', class: 'w-5 h-5 inline') %>
-              <span><%= signature.signature_type %></span>
+              <span><%= signature.type %></span>
             </div>
           </div>
         <% end %>

config/application.rb

@@ -19,6 +19,8 @@ module DocuSeal
   class Application < Rails::Application
     config.load_defaults 8.1
 
+    config.active_support.message_serializer = :json
+
     config.autoload_lib(ignore: %w[assets tasks puma])
 
     config.active_storage.routes_prefix = ''

config/initializers/hexapdf.rb

@@ -46,6 +46,20 @@ module HexaPDF
       def color_space(name)
         GlobalConfiguration.constantize('color_space.map', name).new
       end
+
+      def [](name)
+        return super unless value[name].nil? && INHERITABLE_FIELDS.include?(name)
+
+        seen = Set.new.compare_by_identity
+        seen << value
+        node = self
+
+        while node.value[name].nil? && (parent = node[:Parent]) && seen.add?(parent.value)
+          node = parent
+        end
+
+        node == self || node.value[name].nil? ? super : node[name]
+      end
     end
 
     # fix NoMethodError: undefined method `field_value' for #<HexaPDF::Type::AcroForm::Field
@@ -112,6 +126,8 @@ module HexaPDF
   end
 
   module CycleSafeInheritedValue
+    using HexaPDF::Type::AcroForm::Field::HashRefinement
+
     def inherited_value(field, name)
       seen = Set.new.compare_by_identity
       seen << field.value
@@ -167,8 +183,53 @@ module HexaPDF
       end
     end
   end
+
+  module CycleSafePageAncestors
+    def index
+      acyclic_ancestors? ? super : 0
+    end
+
+    def ancestor_nodes
+      acyclic_ancestors? ? super : []
+    end
+
+    private
+
+    def perform_validation
+      super if acyclic_ancestors?
+    end
+
+    def acyclic_ancestors?
+      seen = Set.new.compare_by_identity
+      node = self
+      node = node[:Parent] while node && seen.add?(node.value)
+      node.nil?
+    end
+  end
+
+  module CycleSafeOutlineEndpoints
+    private
+
+    def perform_validation
+      first = value[:First]
+      last = value[:Last]
+
+      if (first && !last) || (!first && last)
+        node, dir = first ? [self[:First], :Next] : [self[:Last], :Prev]
+        seen = Set.new.compare_by_identity
+        node = node[dir] while node && seen.add?(node.value)
+
+        return if node
+      end
+
+      super
+    end
+  end
 end
 
 HexaPDF::Type::AcroForm::Field.singleton_class.prepend(HexaPDF::CycleSafeInheritedValue)
 HexaPDF::Type::AcroForm::Field.prepend(HexaPDF::CycleSafeFullFieldName)
 HexaPDF::Type::AcroForm::Form.prepend(HexaPDF::CycleSafeEachField)
+HexaPDF::Type::Page.prepend(HexaPDF::CycleSafePageAncestors)
+HexaPDF::Type::Outline.prepend(HexaPDF::CycleSafeOutlineEndpoints)
+HexaPDF::Type::OutlineItem.prepend(HexaPDF::CycleSafeOutlineEndpoints)

config/locales/i18n.yml

@@ -228,6 +228,7 @@ en: &en
   profile_details: Profile Details
   sign_up_with_google: Sign up with Google
   sign_up_with_microsoft: Sign up with Microsoft
+  redirecting_to_provider: Redirecting to %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'By creating an account, you agree to our <a target="_blank" href="https://www.docuseal.com/privacy">Privacy Policy</a> and <a target="_blank" href="https://www.docuseal.com/terms">Terms of Service</a>.'
   enter_email_to_continue: Enter email to continue
   account: Account
@@ -596,6 +597,9 @@ en: &en
   there_are_no_signatures: There are no signatures
   signed_with_trusted_certificate: Signed with trusted certificate
   signed_with_external_certificate: Signed with external certificate
+  signature_valid: Signature valid
+  signature_verification_failed: Signature verification failed
+  contains_unsigned_changes_after_the_last_signature: Contains unsigned changes after the last signature
   setup_2fa_to_continue: Setup 2FA to continue.
   create_a_new_account: Create a new account.
   you_are_already_signed_in: You are already signed in.
@@ -786,6 +790,7 @@ en: &en
   the_code_has_been_sent_to_your_email: The code has been sent to your email.
   enter_the_verification_code_from_your_email: Enter the verification code from your email.
   too_many_attempts: Too many attempts.
+  verification_email_bounced: "Unable to send the verification code: email to this address bounced."
   verification_code: Verification Code
   resend_code: Resend Code
   verify_new_sign_in: Verify new sign in
@@ -988,6 +993,13 @@ en: &en
   open_file_from: 'Open file from'
   cancel: Cancel
   open: Open
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: Signature request email sent to recipients with a link to review and sign.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: View only email sent to recipients that need to only review the documents.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Reminds recipients who haven't completed their part yet to sign, following the reminders schedule.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: Signature request SMS sent to recipients with a link to review and sign.
+  phone_2fa_verification_text_message: Phone 2FA verification text message.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: Notification email sent to the sender user and BCC addresses once the submission is completed by all parties.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: Completed documents copy email sent to recipients upon completion containing their documents.
   devise:
     confirmations:
       confirmed: Your email address has been successfully confirmed.
@@ -1003,6 +1015,7 @@ en: &en
     invite: Invite
     link: Link
     mcp: MCP
+    self: Sign Yourself
   submission_event_names:
     send_email_to_html: '<b>Email sent</b> to %{submitter_name}'
     bounce_email_html: '<b>Email bounced</b> %{submitter_name}'
@@ -1338,6 +1351,7 @@ es: &es
   profile_details: Detalles del perfil
   sign_up_with_google: Registrarse con Google
   sign_up_with_microsoft: Registrarse con Microsoft
+  redirecting_to_provider: Redirigiendo a %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Al crear una cuenta, aceptas nuestra <a target="_blank" href="https://www.docuseal.com/privacy">Política de Privacidad</a> y <a target="_blank" href="https://www.docuseal.com/terms">Términos de Servicio</a>.'
   enter_email_to_continue: Ingresa tu correo electrónico para continuar
   account: Cuenta
@@ -1465,6 +1479,13 @@ es: &es
   completed_form_message: Mensaje de formulario completado
   completed_form_redirect_button: Botón de redirección de formulario completado
   documents_copy_email: Correo de copia de documentos
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: Correo de solicitud de firma enviado a los destinatarios con un enlace para revisar y firmar.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: Correo de solo lectura enviado a los destinatarios que solo necesitan revisar los documentos.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Recuerda firmar a los destinatarios que aún no han completado su parte, según la programación de recordatorios.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: SMS de solicitud de firma enviado a los destinatarios con un enlace para revisar y firmar.
+  phone_2fa_verification_text_message: Mensaje de texto de verificación 2FA por teléfono.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: Correo de notificación enviado al usuario remitente y a las direcciones BCC una vez que todas las partes han completado el envío.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: Correo con la copia de los documentos completados enviado a los destinatarios al finalizar, con sus documentos.
   form_custom_css: CSS personalizado del formulario
   subject: Asunto
   body: Cuerpo
@@ -1706,6 +1727,9 @@ es: &es
   there_are_no_signatures: No hay firmas
   signed_with_trusted_certificate: Firmado con certificado de confianza
   signed_with_external_certificate: Firmado con certificado externo
+  signature_valid: Firma válida
+  signature_verification_failed: Verificación de firma fallida
+  contains_unsigned_changes_after_the_last_signature: Contiene cambios no firmados después de la última firma
   setup_2fa_to_continue: Configura 2FA para continuar.
   create_a_new_account: Crear una nueva cuenta.
   you_are_already_signed_in: Ya has iniciado sesión.
@@ -1893,6 +1917,7 @@ es: &es
   the_code_has_been_sent_to_your_email: El código ha sido enviado a tu correo electrónico.
   enter_the_verification_code_from_your_email: Ingresa el código de verificación de tu correo electrónico.
   too_many_attempts: Demasiados intentos.
+  verification_email_bounced: "No se pudo enviar el código de verificación: el correo a esta dirección rebotó."
   verification_code: Código de Verificación
   resend_code: Reenviar Código
   verify_new_sign_in: Verificar nuevo inicio de sesión
@@ -2110,6 +2135,7 @@ es: &es
     invite: Invitación
     link: Enlace
     mcp: MCP
+    self: Firma tú mismo
   submission_event_names:
     send_email_to_html: '<b>Correo electrónico enviado</b> a %{submitter_name}'
     bounce_email_html: '<b>Correo electrónico rebotado</b> %{submitter_name}'
@@ -2459,6 +2485,7 @@ it: &it
   profile_details: Dettagli del profilo
   sign_up_with_google: Registrati con Google
   sign_up_with_microsoft: Registrati con Microsoft
+  redirecting_to_provider: Reindirizzamento a %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Creando un account, accetti la nostra <a target="_blank" href="https://www.docuseal.com/privacy">Privacy Policy</a> e i nostri <a target="_blank" href="https://www.docuseal.com/terms">Termini di servizio</a>.'
   enter_email_to_continue: "Inserisci l'email per continuare"
   account: Account
@@ -2586,6 +2613,13 @@ it: &it
   completed_form_message: Messaggio di completamento del modulo
   completed_form_redirect_button: Pulsante di reindirizzamento dopo il completamento del modulo
   documents_copy_email: Email con copia dei documenti
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: Email di richiesta di firma inviata ai destinatari con un link per revisionare e firmare.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: Email di sola lettura inviata ai destinatari che devono solo revisionare i documenti.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Ricorda di firmare ai destinatari che non hanno ancora completato la loro parte, in base alla pianificazione dei promemoria.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: SMS di richiesta di firma inviato ai destinatari con un link per revisionare e firmare.
+  phone_2fa_verification_text_message: Messaggio di testo per la verifica 2FA tramite telefono.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: Email di notifica inviata all'utente mittente e agli indirizzi BCC una volta che l'invio è stato completato da tutte le parti.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: Email con la copia dei documenti completati inviata ai destinatari al completamento, con i loro documenti.
   form_custom_css: CSS personalizzato del modulo
   subject: Oggetto
   body: Corpo
@@ -2827,6 +2861,9 @@ it: &it
   there_are_no_signatures: Non ci sono firme
   signed_with_trusted_certificate: Firmato con certificato affidabile
   signed_with_external_certificate: Firmato con certificato esterno
+  signature_valid: Firma valida
+  signature_verification_failed: Verifica della firma non riuscita
+  contains_unsigned_changes_after_the_last_signature: Contiene modifiche non firmate dopo l’ultima firma
   setup_2fa_to_continue: Configura 2FA per continuare.
   create_a_new_account: Crea un nuovo account.
   you_are_already_signed_in: "Hai già effettuato l'accesso."
@@ -3014,6 +3051,7 @@ it: &it
   the_code_has_been_sent_to_your_email: Il codice è stato inviato alla tua e-mail.
   enter_the_verification_code_from_your_email: Inserisci il codice di verifica dalla tua e-mail.
   too_many_attempts: Troppi tentativi.
+  verification_email_bounced: "Impossibile inviare il codice di verifica: l'email a questo indirizzo è stata respinta."
   verification_code: Codice di Verifica
   resend_code: Reinvia Codice
   verify_new_sign_in: Verifica nuovo accesso
@@ -3231,6 +3269,7 @@ it: &it
     invite: Invito
     link: Link
     mcp: MCP
+    self: Firma te stesso
   submission_event_names:
     send_email_to_html: '<b>Email inviata</b> a %{submitter_name}'
     bounce_email_html: '<b>Email respinta</b> %{submitter_name}'
@@ -3566,6 +3605,7 @@ fr: &fr
   profile_details: Détails du profil
   sign_up_with_google: S’inscrire avec Google
   sign_up_with_microsoft: S’inscrire avec Microsoft
+  redirecting_to_provider: Redirection vers %{provider}...
   by_creating_an_account_you_agree_to_our_html: En créant un compte, vous acceptez notre <a target="_blank" href="https://www.docuseal.com/privacy">Politique de confidentialité</a> et nos <a target="_blank" href="https://www.docuseal.com/terms">Conditions d’utilisation</a>.
   enter_email_to_continue: Entrez votre e‑mail pour continuer
   account: Compte
@@ -3693,6 +3733,13 @@ fr: &fr
   completed_form_message: Message de formulaire complété
   completed_form_redirect_button: Bouton de redirection après finalisation
   documents_copy_email: E‑mail avec copie des documents
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: E-mail de demande de signature envoyé aux destinataires avec un lien pour consulter et signer.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: E-mail en lecture seule envoyé aux destinataires qui doivent uniquement consulter les documents.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Rappelle de signer aux destinataires qui n'ont pas encore terminé leur partie, selon la planification des rappels.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: SMS de demande de signature envoyé aux destinataires avec un lien pour consulter et signer.
+  phone_2fa_verification_text_message: Message texte de vérification 2FA par téléphone.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: E-mail de notification envoyé à l'utilisateur expéditeur et aux adresses Cci une fois la soumission complétée par toutes les parties.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: E-mail avec la copie des documents finalisés, envoyé aux destinataires à la finalisation, contenant leurs documents.
   form_custom_css: CSS personnalisé du formulaire
   subject: Objet
   body: Corps
@@ -3934,6 +3981,9 @@ fr: &fr
   there_are_no_signatures: Il n’y a pas de signatures
   signed_with_trusted_certificate: Signé avec un certificat de confiance
   signed_with_external_certificate: Signé avec un certificat externe
+  signature_valid: Signature valide
+  signature_verification_failed: Échec de la vérification de la signature
+  contains_unsigned_changes_after_the_last_signature: Contient des modifications non signées après la dernière signature
   setup_2fa_to_continue: Configurez la 2FA pour continuer.
   create_a_new_account: Créer un nouveau compte.
   you_are_already_signed_in: Vous êtes déjà connecté.
@@ -4121,6 +4171,7 @@ fr: &fr
   the_code_has_been_sent_to_your_email: Le code a été envoyé à votre e‑mail.
   enter_the_verification_code_from_your_email: Saisissez le code de vérification reçu par e‑mail.
   too_many_attempts: Trop de tentatives.
+  verification_email_bounced: "Impossible d'envoyer le code de vérification : l'e-mail à cette adresse a été rejeté."
   verification_code: Code de vérification
   resend_code: Renvoyer le code
   verify_new_sign_in: Vérifier une nouvelle connexion
@@ -4335,6 +4386,7 @@ fr: &fr
     invite: Invitation
     link: Lien
     mcp: MCP
+    self: Signer vous-même
   submission_event_names:
     send_email_to_html: "<b>E‑mail envoyé</b> à %{submitter_name}"
     bounce_email_html: "<b>E‑mail rejeté</b> %{submitter_name}"
@@ -4683,6 +4735,7 @@ pt: &pt
   profile_details: Detalhes do perfil
   sign_up_with_google: Inscrever-se com Google
   sign_up_with_microsoft: Inscrever-se com Microsoft
+  redirecting_to_provider: Redirecionando para %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Ao criar uma conta, você concorda com nossa <a target="_blank" href="https://www.docuseal.com/privacy">Política de Privacidade</a> e <a target="_blank" href="https://www.docuseal.com/terms">Termos de Serviço</a>.'
   enter_email_to_continue: Insira o e-mail para continuar
   account: Conta
@@ -4810,6 +4863,13 @@ pt: &pt
   completed_form_message: Mensagem de formulário concluído
   completed_form_redirect_button: Botão de redirecionamento do formulário concluído
   documents_copy_email: E-mail com cópia dos documentos
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: E-mail de solicitação de assinatura enviado aos destinatários com um link para revisar e assinar.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: E-mail somente de leitura enviado aos destinatários que precisam apenas revisar os documentos.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Lembra os destinatários que ainda não concluíram a sua parte de assinar, de acordo com o agendamento de lembretes.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: SMS de solicitação de assinatura enviado aos destinatários com um link para revisar e assinar.
+  phone_2fa_verification_text_message: Mensagem de texto de verificação 2FA por telefone.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: E-mail de notificação enviado ao usuário remetente e aos endereços BCC assim que a submissão for concluída por todas as partes.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: E-mail com a cópia dos documentos concluídos enviado aos destinatários na conclusão, com os seus documentos.
   form_custom_css: CSS personalizado do formulário
   subject: Assunto
   body: Corpo
@@ -5051,6 +5111,9 @@ pt: &pt
   there_are_no_signatures: Não há assinaturas
   signed_with_trusted_certificate: Assinado com certificado confiável
   signed_with_external_certificate: Assinado com certificado externo
+  signature_valid: Assinatura válida
+  signature_verification_failed: Falha na verificação da assinatura
+  contains_unsigned_changes_after_the_last_signature: Contém alterações não assinadas após a última assinatura
   setup_2fa_to_continue: Configure 2FA para continuar.
   create_a_new_account: Criar uma nova conta.
   you_are_already_signed_in: Você já está conectado.
@@ -5238,6 +5301,7 @@ pt: &pt
   the_code_has_been_sent_to_your_email: O código foi enviado para seu e-mail.
   enter_the_verification_code_from_your_email: Insira o código de verificação do seu e-mail.
   too_many_attempts: Muitas tentativas.
+  verification_email_bounced: "Não foi possível enviar o código de verificação: o e-mail para este endereço não foi entregue."
   verification_code: Código de Verificação
   resend_code: Reenviar Código
   verify_new_sign_in: Verificar novo login
@@ -5455,6 +5519,7 @@ pt: &pt
     invite: Convite
     link: Link
     mcp: MCP
+    self: Assine você mesmo
   submission_event_names:
     send_email_to_html: '<b>Email enviado</b> para %{submitter_name}'
     bounce_email_html: '<b>Email não entregue</b> %{submitter_name}'
@@ -5803,6 +5868,7 @@ de: &de
   profile_details: Profildetails
   sign_up_with_google: Mit Google registrieren
   sign_up_with_microsoft: Mit Microsoft registrieren
+  redirecting_to_provider: Weiterleitung zu %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Durch die Erstellung eines Kontos stimmen Sie unseren <a target="_blank" href="https://www.docuseal.com/privacy">Datenschutzrichtlinien</a> und <a target="_blank" href="https://www.docuseal.com/terms">Nutzungsbedingungen</a> zu.'
   enter_email_to_continue: E-Mail eingeben, um fortzufahren
   account: Konto
@@ -5930,6 +5996,13 @@ de: &de
   completed_form_message: Nachricht zum abgeschlossenen Formular
   completed_form_redirect_button: Weiterleitungsschaltfläche nach Formularabschluss
   documents_copy_email: E-Mail mit Dokumentenkopie
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: E-Mail mit der Signaturanfrage, die mit einem Link zum Prüfen und Signieren an die Empfänger gesendet wird.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: E-Mail nur zur Ansicht, die an Empfänger gesendet wird, die die Dokumente nur prüfen müssen.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Erinnert Empfänger, die ihren Teil noch nicht abgeschlossen haben, an das Signieren, gemäß dem Erinnerungszeitplan.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: SMS mit der Signaturanfrage, die mit einem Link zum Prüfen und Signieren an die Empfänger gesendet wird.
+  phone_2fa_verification_text_message: Textnachricht zur 2FA-Verifizierung per Telefon.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: Benachrichtigungs-E-Mail, die an den absendenden Benutzer und die BCC-Adressen gesendet wird, sobald die Einreichung von allen Parteien abgeschlossen wurde.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: E-Mail mit der Kopie der abgeschlossenen Dokumente, die nach Abschluss an die Empfänger gesendet wird.
   form_custom_css: Benutzerdefiniertes CSS für Formular
   subject: Betreff
   body: Inhalt
@@ -6171,6 +6244,9 @@ de: &de
   there_are_no_signatures: Es gibt keine Unterschriften
   signed_with_trusted_certificate: Signiert mit vertrauenswürdigem Zertifikat
   signed_with_external_certificate: Signiert mit externem Zertifikat
+  signature_valid: Signatur gültig
+  signature_verification_failed: Signaturprüfung fehlgeschlagen
+  contains_unsigned_changes_after_the_last_signature: Enthält nicht signierte Änderungen nach der letzten Signatur
   setup_2fa_to_continue: Richten Sie 2FA ein, um fortzufahren.
   create_a_new_account: Neues Konto erstellen.
   you_are_already_signed_in: Sie sind bereits angemeldet.
@@ -6358,6 +6434,7 @@ de: &de
   the_code_has_been_sent_to_your_email: Der Code wurde an Ihre E-Mail gesendet.
   enter_the_verification_code_from_your_email: Geben Sie den Verifizierungscode aus Ihrer E-Mail ein.
   too_many_attempts: Zu viele Versuche.
+  verification_email_bounced: "Der Verifizierungscode konnte nicht gesendet werden: E-Mail an diese Adresse ist unzustellbar."
   verification_code: Verifizierungscode
   resend_code: Code erneut senden
   verify_new_sign_in: Neue Anmeldung verifizieren
@@ -6575,6 +6652,7 @@ de: &de
     invite: Einladung
     link: Link
     mcp: MCP
+    self: Selbst unterschreiben
   submission_event_names:
     send_email_to_html: '<b>E-Mail gesendet</b> an %{submitter_name}'
     bounce_email_html: '<b>E-Mail unzustellbar</b> %{submitter_name}'
@@ -6790,11 +6868,14 @@ pl:
   profile_details: Szczegóły profilu
   sign_up_with_google: Zarejestruj się przez Google
   sign_up_with_microsoft: Zarejestruj się przez Microsoft
+  redirecting_to_provider: Przekierowywanie do %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Tworząc konto, akceptujesz naszą <a target="_blank" href="https://www.docuseal.com/privacy">Politykę Prywatności</a> i <a target="_blank" href="https://www.docuseal.com/terms">Regulamin</a>.'
   enter_email_to_continue: Wprowadź e-mail, aby kontynuować
   the_code_has_been_sent_to_your_email: Kod został wysłany na Twój e-mail.
   enter_the_verification_code_from_your_email: Wprowadź kod weryfikacyjny z Twojego e-maila.
   too_many_attempts: Zbyt wiele prób.
+  verification_email_bounced: "Nie można wysłać kodu weryfikacyjnego: e-mail na ten adres został odrzucony."
+  back: Wstecz
   verification_code: Kod Weryfikacyjny
   resend_code: Wyślij Kod Ponownie
   powered_by: 'Napędzany przez'
@@ -6929,11 +7010,14 @@ uk:
   profile_details: Дані профілю
   sign_up_with_google: Зареєструватися через Google
   sign_up_with_microsoft: Зареєструватися через Microsoft
+  redirecting_to_provider: Перенаправлення до %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Створюючи акаунт, ви погоджуєтесь з нашою <a target="_blank" href="https://www.docuseal.com/privacy">Політикою конфіденційності</a> і <a target="_blank" href="https://www.docuseal.com/terms">Умовами надання послуг</a>.'
   enter_email_to_continue: Введіть електронну пошту, щоб продовжити
   the_code_has_been_sent_to_your_email: Код було надіслано на вашу електронну пошту.
   enter_the_verification_code_from_your_email: Введіть код перевірки з вашої електронної пошти.
   too_many_attempts: Забагато спроб.
+  verification_email_bounced: "Не вдалося надіслати код підтвердження: лист на цю адресу було відхилено."
+  back: Назад
   verification_code: Код перевірки
   resend_code: Надіслати код знову
   powered_by: 'Працює на базі'
@@ -7068,11 +7152,14 @@ cs:
   profile_details: Detaily profilu
   sign_up_with_google: Zaregistrovat se pomocí Googlu
   sign_up_with_microsoft: Zaregistrovat se pomocí Microsoftu
+  redirecting_to_provider: Přesměrování na %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'Vytvořením účtu souhlasíte s našimi <a target="_blank" href="https://www.docuseal.com/privacy">Zásadami ochrany osobních údajů</a> a <a target="_blank" href="https://www.docuseal.com/terms">Podmínkami služby</a>.'
   enter_email_to_continue: Zadejte e-mail pro pokračování
   the_code_has_been_sent_to_your_email: Kód byl odeslán na váš e-mail.
   enter_the_verification_code_from_your_email: Zadejte ověřovací kód z vašeho e-mailu.
   too_many_attempts: Příliš mnoho pokusů.
+  verification_email_bounced: "Ověřovací kód nelze odeslat: e-mail na tuto adresu byl odmítnut."
+  back: Zpět
   verification_code: Ověřovací kód
   resend_code: Znovu odeslat kód
   powered_by: 'Poháněno'
@@ -7193,11 +7280,14 @@ he:
   profile_details: פרטי הפרופיל
   sign_up_with_google: הירשם עם גוגל
   sign_up_with_microsoft: הירשם עם מיקרוסופט
+  redirecting_to_provider: מפנה אל %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'על ידי יצירת חשבון, אתה מסכים ל<a target="_blank" href="https://www.docuseal.com/privacy">מדיניות הפרטיות</a> ול<a target="_blank" href="https://www.docuseal.com/terms">תנאי השירות</a> שלנו.'
   enter_email_to_continue: הכנס דוא"ל כדי להמשיך
   the_code_has_been_sent_to_your_email: הקוד נשלח לדוא"ל שלך.
   enter_the_verification_code_from_your_email: הזן את קוד האימות מדוא"ל שלך.
   too_many_attempts: יותר מדי ניסיונות.
+  verification_email_bounced: "לא ניתן לשלוח את קוד האימות: האימייל לכתובת זו נדחה."
+  back: חזרה
   verification_code: קוד אימות
   resend_code: שלח קוד מחדש
   powered_by: 'מופעל על ידי'
@@ -7439,6 +7529,7 @@ nl: &nl
   profile_details: Profielgegevens
   sign_up_with_google: Registreren met Google
   sign_up_with_microsoft: Registreren met Microsoft
+  redirecting_to_provider: Doorverwijzen naar %{provider}...
   by_creating_an_account_you_agree_to_our_html: Door een account aan te maken gaat u akkoord met ons <a target="_blank" href="https://www.docuseal.com/privacy">Privacybeleid</a> en onze <a target="_blank" href="https://www.docuseal.com/terms">Servicevoorwaarden</a>.
   enter_email_to_continue: Voer e-mailadres in om door te gaan
   account: Account
@@ -7566,6 +7657,13 @@ nl: &nl
   completed_form_message: Bericht voltooid formulier
   completed_form_redirect_button: Knop voor doorverwijzing na voltooid formulier
   documents_copy_email: E-mail met kopie van documenten
+  signature_request_email_sent_to_recipients_with_a_link_to_review_and_sign: E-mail met het handtekeningverzoek die naar de ontvangers wordt verzonden met een link om te bekijken en te ondertekenen.
+  view_only_email_sent_to_recipients_that_need_to_only_review_the_documents: E-mail met alleen weergave die wordt verzonden naar ontvangers die de documenten alleen hoeven te bekijken.
+  reminds_recipients_who_havent_completed_their_part_yet_to_sign_following_the_reminders_schedule: Herinnert ontvangers die hun deel nog niet hebben voltooid eraan te ondertekenen, volgens het herinneringsschema.
+  signature_request_sms_sent_to_recipients_with_a_link_to_review_and_sign: Sms met het handtekeningverzoek die naar de ontvangers wordt verzonden met een link om te bekijken en te ondertekenen.
+  phone_2fa_verification_text_message: Sms-bericht voor 2FA-verificatie via telefoon.
+  notification_email_sent_to_the_sender_user_and_bcc_addresses_once_the_submission_is_completed_by_all_parties: Meldingse-mail die naar de verzendende gebruiker en de BCC-adressen wordt gestuurd zodra de indiening door alle partijen is voltooid.
+  completed_documents_copy_email_sent_to_recipients_upon_completion_containing_their_documents: E-mail met een kopie van de voltooide documenten die na voltooiing naar de ontvangers wordt verzonden.
   form_custom_css: Aangepaste CSS voor formulier
   subject: Onderwerp
   body: Inhoud
@@ -7807,6 +7905,9 @@ nl: &nl
   there_are_no_signatures: Er zijn geen handtekeningen
   signed_with_trusted_certificate: Ondertekend met vertrouwd certificaat
   signed_with_external_certificate: Ondertekend met extern certificaat
+  signature_valid: Handtekening geldig
+  signature_verification_failed: Verificatie van handtekening mislukt
+  contains_unsigned_changes_after_the_last_signature: Bevat niet-ondertekende wijzigingen na de laatste handtekening
   setup_2fa_to_continue: Stel 2FA in om door te gaan.
   create_a_new_account: Maak een nieuw account aan.
   you_are_already_signed_in: U bent al aangemeld.
@@ -7994,6 +8095,7 @@ nl: &nl
   the_code_has_been_sent_to_your_email: De code is naar uw e-mail verzonden.
   enter_the_verification_code_from_your_email: Voer de verificatiecode uit uw e-mail in.
   too_many_attempts: Te veel pogingen.
+  verification_email_bounced: "Verificatiecode kan niet worden verzonden: e-mail naar dit adres is geretourneerd."
   verification_code: Verificatiecode
   resend_code: Code opnieuw verzenden
   verify_new_sign_in: Nieuwe aanmelding verifiëren
@@ -8207,6 +8309,7 @@ nl: &nl
     invite: Uitnodiging
     link: Link
     mcp: MCP
+    self: Zelf ondertekenen
   submission_event_names:
     send_email_to_html: "<b>E-mail verzonden</b> naar %{submitter_name}"
     bounce_email_html: "<b>E-mail geretourneerd</b> %{submitter_name}"
@@ -8409,11 +8512,14 @@ ar:
   profile_details: تفاصيل الملف الشخصي
   sign_up_with_google: الاشتراك باستخدام جوجل
   sign_up_with_microsoft: الاشتراك باستخدام مايكروسوفت
+  redirecting_to_provider: جارٍ إعادة التوجيه إلى %{provider}...
   by_creating_an_account_you_agree_to_our_html: 'من خلال إنشاء حساب، فإنك توافق على <a target="_blank" href="https://www.docuseal.com/privacy">سياسة الخصوصية</a> و<a target="_blank" href="https://www.docuseal.com/terms">شروط الخدمة</a> الخاصة بنا.'
   enter_email_to_continue: أدخل البريد الإلكتروني للمتابعة
   the_code_has_been_sent_to_your_email: تم إرسال الرمز إلى بريدك الإلكتروني.
   enter_the_verification_code_from_your_email: أدخل رمز التحقق من بريدك الإلكتروني.
   too_many_attempts: عدد المحاولات كبير جدًا.
+  verification_email_bounced: "تعذر إرسال رمز التحقق: تم رفض البريد الإلكتروني المرسل إلى هذا العنوان."
+  back: رجوع
   verification_code: رمز التحقق
   resend_code: إعادة إرسال الرمز
   powered_by: 'مشغل بواسطة'
@@ -8520,11 +8626,14 @@ ko:
   profile_details: 프로필 세부 정보
   sign_up_with_google: Google로 가입
   sign_up_with_microsoft: Microsoft로 가입
+  redirecting_to_provider: "%{provider}(으)로 이동 중..."
   by_creating_an_account_you_agree_to_our_html: '계정을 생성함으로써, <a target="_blank" href="https://www.docuseal.com/privacy">개인정보 처리방침</a> 및 <a target="_blank" href="https://www.docuseal.com/terms">서비스 약관</a>에 동의하게 됩니다.'
   enter_email_to_continue: 계속하려면 이메일을 입력하세요
   the_code_has_been_sent_to_your_email: 코드가 이메일로 전송되었습니다.
   enter_the_verification_code_from_your_email: 이메일로 받은 인증 코드를 입력하세요.
   too_many_attempts: 시도 횟수가 너무 많습니다.
+  verification_email_bounced: "인증 코드를 보낼 수 없습니다: 이 주소로 보낸 이메일이 반송되었습니다."
+  back: 뒤로
   verification_code: 인증 코드
   resend_code: 코드 재전송
   powered_by: '제공:'
@@ -8631,11 +8740,14 @@ ja:
   profile_details: プロフィールの詳細
   sign_up_with_google: Googleで登録
   sign_up_with_microsoft: Microsoftで登録
+  redirecting_to_provider: "%{provider} にリダイレクトしています..."
   by_creating_an_account_you_agree_to_our_html: '<a target="_blank" href="https://www.docuseal.com/privacy">プライバシーポリシー</a>および<a target="_blank" href="https://www.docuseal.com/terms">利用規約</a>に同意の上、アカウントを作成します。'
   enter_email_to_continue: 続行するにはメールを入力してください
   the_code_has_been_sent_to_your_email: コードがあなたのメールに送信されました
   enter_the_verification_code_from_your_email: メールに記載された認証コードを入力してください
   too_many_attempts: 試行回数が多すぎます
+  verification_email_bounced: "認証コードを送信できません：このアドレス宛のメールが配信できませんでした。"
+  back: 戻る
   verification_code: 認証コード
   resend_code: コードを再送信
   powered_by: '提供元：'

config/routes.rb

@@ -142,7 +142,8 @@ Rails.application.routes.draw do
     get :completed
   end
 
-  resource :resubmit_form, controller: 'start_form', only: :update
+  resource :resubmit_form, controller: 'start_form_resubmit', only: :update
+  resources :start_form_self, only: :update
   resource :submit_form_email_2fa, only: %i[create update]
   resources :start_form_email_2fa_send, only: :create
 
@@ -174,10 +175,13 @@ Rails.application.routes.draw do
 
   resources :submitters, only: %i[] do
     resources :download, only: %i[index], controller: 'submitters_download', constraints: { submitter_id: /\d+/ }
-    resources :download, only: %i[index], controller: 'submit_form_completed_download'
     resources :send_email, only: %i[create], controller: 'submitters_send_email'
   end
 
+  resources :submitters, only: %i[], param: 'slug' do
+    resources :download, only: %i[index], controller: 'submit_form_completed_download'
+  end
+
   resources :settings, only: %i[index]
 
   scope '/settings', as: :settings do

config/secrets.yml

@@ -1,8 +0,0 @@
-development:
-  secret_key_base: 5e626815c7ef00cc5d7b46ff3099160f25e5271b00ced3b8eba1d5045eb0db0ddb925c85b2fea6b2acb4cbdcb779ba9c5a31600f31e6ee8944ada47a768f6a7f
-
-test:
-  secret_key_base: 7d754998067691dc61859c6c3109966c44e1756a46fd2409f1d81403599605c103ff84b12102673b498bdbaba04d9949d8d7a2f7af47529ee6dc4dd19f0aef3e
-
-production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

db/migrate/20260819091500_add_submissions_account_template_statistics.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddSubmissionsAccountTemplateStatistics < ActiveRecord::Migration[8.1]
+  def up
+    return unless adapter_name == 'PostgreSQL'
+
+    execute <<~SQL.squish
+      CREATE STATISTICS IF NOT EXISTS submissions_account_template_stats (dependencies, ndistinct)
+      ON account_id, template_id FROM submissions
+    SQL
+  end
+
+  def down
+    return unless adapter_name == 'PostgreSQL'
+
+    execute 'DROP STATISTICS IF EXISTS submissions_account_template_stats'
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.1].define(version: 2026_07_07_055354) do
+ActiveRecord::Schema[8.1].define(version: 2026_08_19_091500) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "pg_catalog.plpgsql"

lib/load_bmp.rb

@@ -3,6 +3,9 @@
 module LoadBmp
   BPPS = [1, 4, 8, 24, 32].freeze
 
+  MAX_COORD = ENV.fetch('VIPS_MAX_COORD', '17000').to_i
+  MAX_PIXELS = 145_000_000
+
   module_function
 
   # rubocop:disable Metrics
@@ -18,40 +21,28 @@ module LoadBmp
       header_data[:height]
     )
 
-    if header_data[:bpp] <= 8
-      final_pixel_data = decode_indexed_pixel_data(
-        raw_pixel_data_from_file,
-        header_data[:bpp],
-        header_data[:width],
-        header_data[:height],
-        header_data[:bmp_stride],
-        header_data[:color_table]
-      )
-      bands = 3
-    else
-      final_pixel_data = prepare_unpadded_pixel_data_string(
-        raw_pixel_data_from_file,
-        header_data[:bpp],
-        header_data[:width],
-        header_data[:height],
-        header_data[:bmp_stride]
-      )
-      bands = header_data[:bpp] / 8
-    end
-
-    image = Vips::Image.new_from_memory_copy(final_pixel_data, header_data[:width], header_data[:height], bands, :uchar)
-
-    image = image.flip(:vertical) if header_data[:orientation] == -1
+    padded_rows = Vips::Image.new_from_memory_copy(
+      raw_pixel_data_from_file,
+      header_data[:bmp_stride],
+      header_data[:height],
+      1,
+      :uchar
+    )
 
     image_rgb =
       if header_data[:bpp] <= 8
-        image
-      elsif bands == 3
-        image.recomb(band3_recomb)
-      elsif bands == 4
-        image.recomb(band4_recomb)
+        decode_indexed_pixel_data(padded_rows, header_data[:bpp], header_data[:width], header_data[:color_table])
+      else
+        bands = header_data[:bpp] / 8
+
+        image = padded_rows.extract_area(0, 0, header_data[:width] * bands, header_data[:height])
+                           .bandfold(factor: bands)
+
+        bands == 3 ? image.recomb(band3_recomb) : image.recomb(band4_recomb)
       end
 
+    image_rgb = image_rgb.flip(:vertical) if header_data[:orientation] == -1
+
     image_rgb = image_rgb.copy(interpretation: :srgb) if image_rgb.interpretation != :srgb
 
     image_rgb
@@ -98,6 +89,9 @@ module LoadBmp
 
     raise ArgumentError, 'BMP width must be positive.' if width <= 0
     raise ArgumentError, 'BMP height must be positive.' if height <= 0
+    if width > MAX_COORD || height > MAX_COORD || width * height > MAX_PIXELS
+      raise ArgumentError, "BMP dimensions are too large: #{width}x#{height}."
+    end
 
     if compression != 0
       raise ArgumentError,
@@ -164,62 +158,24 @@ module LoadBmp
     raw_pixel_data_from_file
   end
 
-  def prepare_unpadded_pixel_data_string(raw_pixel_data_from_file, bpp, width, height, bmp_stride)
-    bytes_per_pixel = bpp / 8
-    actual_row_width_bytes = width * bytes_per_pixel
+  def decode_indexed_pixel_data(padded_rows, bpp, width, color_table)
+    pixels_per_byte = 8 / bpp
 
-    unpadded_rows = Array.new(height)
-    current_offset_in_blob = 0
+    image = padded_rows.maplut(build_palette_lut(bpp, color_table))
+    image = image.bandunfold.bandfold(factor: 3) if pixels_per_byte > 1
 
-    height.times do |i|
-      if current_offset_in_blob + actual_row_width_bytes > raw_pixel_data_from_file.bytesize
-        raise ArgumentError,
-              "Not enough data in pixel blob for row #{i}. Offset #{current_offset_in_blob}, " \
-              "row width #{actual_row_width_bytes}, blob size #{raw_pixel_data_from_file.bytesize}"
-      end
-
-      unpadded_row_slice = raw_pixel_data_from_file.byteslice(current_offset_in_blob, actual_row_width_bytes)
-
-      if unpadded_row_slice.nil? || unpadded_row_slice.bytesize < actual_row_width_bytes
-        raise ArgumentError, "Failed to slice a full unpadded row from pixel data blob for row #{i}."
-      end
-
-      unpadded_rows[i] = unpadded_row_slice
-      current_offset_in_blob += bmp_stride
-    end
-
-    unpadded_rows.join
+    image.extract_area(0, 0, width, padded_rows.height)
   end
 
-  def decode_indexed_pixel_data(raw_data, bpp, width, height, bmp_stride, color_table)
-    palette = color_table.map { |r, g, b| [r, g, b].pack('CCC') }
+  def build_palette_lut(bpp, color_table)
+    pixels_per_byte = 8 / bpp
+    mask = (1 << bpp) - 1
 
-    output = String.new(capacity: width * height * 3)
-
-    height.times do |y|
-      row_offset = y * bmp_stride
-
-      case bpp
-      when 1
-        width.times do |x|
-          byte_val = raw_data.getbyte(row_offset + (x >> 3))
-          index = (byte_val >> (7 - (x & 7))) & 0x01
-          output << palette[index]
-        end
-      when 4
-        width.times do |x|
-          byte_val = raw_data.getbyte(row_offset + (x >> 1))
-          index = x.even? ? (byte_val >> 4) & 0x0F : byte_val & 0x0F
-          output << palette[index]
-        end
-      when 8
-        width.times do |x|
-          output << palette[raw_data.getbyte(row_offset + x)]
-        end
-      end
+    entries = Array.new(256) do |byte_val|
+      (0...pixels_per_byte).flat_map { |i| color_table[(byte_val >> ((pixels_per_byte - 1 - i) * bpp)) & mask] }
     end
 
-    output
+    Vips::Image.new_from_memory_copy(entries.flatten.pack('C*'), 256, 1, pixels_per_byte * 3, :uchar)
   end
 
   def band3_recomb

lib/load_ico.rb

@@ -94,7 +94,7 @@ module LoadIco
 
     palette = []
     if dib_bpp <= 8
-      num_palette_entries = dib_clr_used.zero? ? (1 << dib_bpp) : dib_clr_used
+      num_palette_entries = [dib_clr_used.zero? ? (1 << dib_bpp) : dib_clr_used, 1 << dib_bpp].min
       num_palette_entries.times do
         palette_color_bytes = dib_io.read(4)
         return nil unless palette_color_bytes && palette_color_bytes.bytesize == 4

lib/params/submission_create_validator.rb

@@ -29,8 +29,6 @@ module Params
       in_path(params, :message) do |message_params|
         type(message_params, :subject, String)
         type(message_params, :body, String)
-
-        required(message_params, :body)
       end
     end
 
@@ -53,8 +51,6 @@ module Params
       in_path(params, :message, skip_blank: true) do |message_params|
         type(message_params, :subject, String)
         type(message_params, :body, String)
-
-        required(message_params, :body)
       end
 
       value_in(params, :order, %w[preserved random], allow_nil: true)
@@ -119,8 +115,6 @@ module Params
       in_path(params, :message) do |message_params|
         type(message_params, :subject, String)
         type(message_params, :body, String)
-
-        required(message_params, :body)
       end
 
       value_in(params, :order, %w[preserved random], allow_nil: true)

lib/pdf_utils.rb

@@ -6,43 +6,19 @@ module PdfUtils
 
   module_function
 
-  def encrypted?(data, password: nil)
-    HexaPDF::Document.new(io: StringIO.new(data), decryption_opts: { password: })
-
-    false
-  rescue HexaPDF::EncryptionError
-    true
-  end
-
-  def decrypt(data, password)
-    encrypted_doc = HexaPDF::Document.new(io: StringIO.new(data), decryption_opts: { password: })
-
-    decrypted_doc = HexaPDF::Document.new
-
-    encrypted_doc.pages.each do |page|
-      decrypted_doc.pages << decrypted_doc.import(page)
-    end
-
-    decrypted_io = StringIO.new
-
-    decrypted_doc.write(decrypted_io, validate: false)
-
-    decrypted_io.tap(&:rewind).read
-  end
-
-  def merge(files)
-    merged_pdf = HexaPDF::Document.new
-
-    files.each do |file|
-      pdf = HexaPDF::Document.new(io: file)
-      pdf.pages.each { |page| merged_pdf.pages << merged_pdf.import(page) }
-    end
-
+  def merge(io_files)
     merged_content = StringIO.new
-    merged_pdf.validate(auto_correct: true)
-    merged_pdf.write(merged_content, validate: false)
-    merged_content.rewind
 
-    merged_content
+    Pdfium.with_instance do
+      Pdfium::Document.create do |merged_pdf|
+        io_files.each do |io|
+          Pdfium::Document.open_io(io) { |pdf| merged_pdf.import_pages(pdf) }
+        end
+
+        merged_pdf.save(merged_content)
+      end
+    end
+
+    merged_content.tap(&:rewind)
   end
 end

lib/search_entries.rb

@@ -236,6 +236,8 @@ module SearchEntries
   end
 
   def add_hyphens(entry, text)
+    text = text.tr('\\', ' ')
+
     hyphens = text.scan(/\b[^\s]*?\d-[^\s]+?\b/) + text.scan(/\b[^\s]+-\d[^\s]*?\b/)
 
     hyphens.uniq.each_with_index do |item, index|

lib/submissions.rb

@@ -3,6 +3,11 @@
 module Submissions
   DEFAULT_SUBMITTERS_ORDER = 'random'
 
+  SKIP_EMAIL_FIX_LABELS = %w[ga gami gasi gil gma gmao gmi gmsi goi ol].freeze
+
+  SKIP_EMAIL_FIX_TLDS =
+    /\.(?:gob(?:\.\w+)?|om|mm|cm|et|mo|nz|za|ie|mom|free|comsec|unicom|ed(?:\.\w+){1,2})\z/i
+
   module_function
 
   def maybe_update_completed_at(submission)
@@ -210,7 +215,7 @@ module Submissions
     return email.downcase.sub(/@gmail?\z/i, '@gmail.com') if email.match?(/@gmail?\z/i)
 
     return email.downcase if email.include?(',') ||
-                             email.match?(/\.(?:gob(?:\.\w+)?|om|mm|cm|et|mo|nz|za|ie|ed\.jp)\z/i) ||
+                             email.match?(SKIP_EMAIL_FIX_TLDS) ||
                              email.exclude?('.')
 
     fixed_email = EmailTypo.call(email.delete_prefix('<'))
@@ -220,8 +225,7 @@ module Submissions
     domain = email.split('@').last.to_s.downcase
     fixed_domain = fixed_email.to_s.split('@').last
 
-    return email.downcase if domain == fixed_domain
-    return email.downcase if fixed_domain.match?(/\Agmail\.(?!com\z)/i)
+    return email.downcase if domain == fixed_domain || skip_email_fix?(domain, fixed_domain)
 
     threshold = fixed_domain.start_with?('hotmail.') ? 2 : 3
 
@@ -236,6 +240,13 @@ module Submissions
     fixed_email
   end
 
+  def skip_email_fix?(domain, fixed_domain)
+    return true if SKIP_EMAIL_FIX_LABELS.include?(domain.split('.').first)
+    return true if fixed_domain.match?(/\Agmail\.(?!com\z)/i)
+
+    fixed_domain.match?(/\A(?:comcast|verizon)\./i) && !domain.match?(/\A(?:comcast|verizon)\./i)
+  end
+
   def filtered_conditions_schema(submission, values: nil, include_submitter_uuid: nil)
     (submission.template_schema || submission.template.schema).filter_map do |item|
       if item['conditions'].present?

lib/submissions/generate_audit_trail.rb

@@ -19,6 +19,7 @@ module Submissions
     }.freeze
 
     TESTING_FOOTER = GenerateResultAttachments::TESTING_FOOTER
+    UNSUPPORTED_IMAGE_TYPES = GenerateResultAttachments::UNSUPPORTED_IMAGE_TYPES
 
     RTL_REGEXP = TextUtils::RTL_REGEXP
     MAX_IMAGE_HEIGHT = 100
@@ -219,7 +220,7 @@ module Submissions
 
         [
           composer.document.layout.formatted_text_box(
-            [{ text: document.filename.to_s }]
+            [{ text: TextUtils.maybe_rtl_reverse(document.filename.to_s) }]
           ),
           composer.document.layout.formatted_text_box(
             [
@@ -272,7 +273,9 @@ module Submissions
           [
             composer.document.layout.formatted_text_box(
               [
-                submission.template_submitters.size > 1 && { text: "#{item['name']}\n" },
+                submission.template_submitters.size > 1 && {
+                  text: "#{TextUtils.maybe_rtl_reverse(item['name'].to_s)}\n"
+                },
                 submitter.email && { text: "#{submitter.email}\n", font: [FONT_NAME, { variant: :bold }] },
                 submitter.name && { text: "#{TextUtils.maybe_rtl_reverse(submitter.name)}\n" },
                 submitter.phone && { text: "#{submitter.phone}\n" }
@@ -299,7 +302,7 @@ module Submissions
                 },
                 completed_event.data['ip'] && { text: "IP: #{completed_event.data['ip']}\n" },
                 completed_event.data['sid'] && { text: "#{I18n.t('session_id')}: #{completed_event.data['sid']}\n" },
-                completed_event.data['ua'] && { text: "User agent: #{completed_event.data['ua']}\n" },
+                completed_event.data['ua'] && { text: "User agent: #{completed_event.data['ua'].to_s.squish}\n" },
                 submitter.timezone && { text: "Time zone: #{submitter.timezone.to_s.sub('Kiev', 'Kyiv')}\n" },
                 "\n"
               ].compact_blank, line_spacing: 1.3, padding: [10, 20, 20, 0]
@@ -352,8 +355,9 @@ module Submissions
 
           field_type = field['type']
 
-          if field_type == 'image' &&
-             submitter.attachments.find { |a| a.uuid == value }.then { |a| !a.image? || a.content_type == 'image/heic' }
+          if (field_type == 'image' || field_type == 'stamp') &&
+             submitter.attachments.find { |a| a.uuid == value }
+                      .then { |a| !a.image? || a.content_type.in?(UNSUPPORTED_IMAGE_TYPES) }
             field_type = 'file'
           end
 
@@ -425,7 +429,7 @@ module Submissions
                       r.submissions_preview_url(submission.slug, **Docuseal.default_url_options)
                     end
 
-                  { link:, text: "#{attachment.filename}\n", style: :link }
+                  { link:, text: "#{TextUtils.maybe_rtl_reverse(attachment.filename.to_s)}\n", style: :link }
                 end,
                 padding: [0, 0, 10, 0]
               )
@@ -476,6 +480,8 @@ module Submissions
               submitter.name || submitter.email || submitter.phone
           end
 
+        submitter_name = TextUtils.maybe_rtl_reverse(submitter_name.to_s.squish)
+
         text =
           if event.event_type == 'complete_verification'
             I18n.t('submission_event_names.complete_verification_by_html', provider: event.data['method'],
@@ -483,18 +489,22 @@ module Submissions
           elsif event.event_type == 'invite_party' &&
                 (invited_submitter = submission.submitters.find { |e| e.uuid == event.data['uuid'] }) &&
                 (name = submission.template_submitters.find { |e| e['uuid'] == event.data['uuid'] }&.dig('name'))
-            invited_submitter_name = [invited_submitter.name || invited_submitter.email || invited_submitter.phone,
-                                      name].join(' ')
+            invited_submitter_name = TextUtils.maybe_rtl_reverse(
+              [invited_submitter.name || invited_submitter.email || invited_submitter.phone, name].join(' ').squish
+            )
             I18n.t('submission_event_names.invite_party_by_html', invited_submitter_name:,
                                                                   submitter_name:)
           elsif with_audit_sender && (event.event_type == 'send_email' || event.event_type == 'send_sms')
+            created_by_name = TextUtils.maybe_rtl_reverse(submission.created_by_user.full_name.to_s.squish)
+
             [
               I18n.t("submission_event_names.#{event.event_type}_to_html", submitter_name:),
-              "<b>#{I18n.t(:from)}</b> #{submission.created_by_user.full_name} #{submission.created_by_user.email}"
+              "<b>#{I18n.t(:from)}</b> #{created_by_name} #{submission.created_by_user.email}"
             ].join("\n")
           elsif event.event_type == 'delegate_form'
             from = event.data['old_email'].presence ||
                    versions.rfind { |v| v.created_at <= event.event_timestamp }&.then { |v| v.name || v.phone }
+            from = TextUtils.maybe_rtl_reverse(from.to_s.squish)
             I18n.t('submission_event_names.delegate_form_by_html', from:, to: event.data['email'])
           elsif event.event_type.include?('send_')
             I18n.t("submission_event_names.#{event.event_type}_to_html", submitter_name:)

lib/submissions/generate_result_attachments.rb

@@ -36,8 +36,12 @@ module Submissions
 
     SIGN_REASON = 'Signed with DocuSeal.com'
 
+    UNSUPPORTED_IMAGE_TYPES = ['image/heic', 'image/avif'].freeze
+
     RTL_REGEXP = TextUtils::RTL_REGEXP
 
+    TEXT_ALIGNS = %w[left center right justify].freeze
+    TEXT_VALIGNS = %w[top center bottom].freeze
     TEXT_LEFT_MARGIN = 1
     TEXT_TOP_MARGIN = 1
     MAX_PAGE_ROTATE = 50
@@ -278,10 +282,10 @@ module Submissions
           value = field['default_value'] if field['type'] == 'heading'
           value = field['default_value'] if field['type'] == 'strikethrough' && value.nil? && field['conditions'].blank?
 
-          text_align = field.dig('preferences', 'align').to_s.to_sym.presence ||
+          text_align = field.dig('preferences', 'align').to_s.presence_in(TEXT_ALIGNS)&.to_sym ||
                        (value.to_s.match?(RTL_REGEXP) ? :right : :left)
 
-          text_valign = (field.dig('preferences', 'valign').to_s.presence || 'center').to_sym
+          text_valign = (field.dig('preferences', 'valign').to_s.presence_in(TEXT_VALIGNS) || 'center').to_sym
 
           layouter = HexaPDF::Layout::TextLayouter.new(text_valign:, text_align:, font:, font_size:)
 
@@ -300,8 +304,9 @@ module Submissions
 
           field_type = field['type']
 
-          if field_type == 'image' &&
-             submitter.attachments.find { |a| a.uuid == value }.then { |a| !a.image? || a.content_type == 'image/heic' }
+          if (field_type == 'image' || field_type == 'stamp') &&
+             submitter.attachments.find { |a| a.uuid == value }
+                      .then { |a| !a.image? || a.content_type.in?(UNSUPPORTED_IMAGE_TYPES) }
             field_type = 'file'
           end
 
@@ -346,8 +351,11 @@ module Submissions
                   (with_signature_id_completed_at ? submitter.completed_at : nil) || attachment.created_at
 
                 if with_signature_id_reason || field.dig('preferences', 'reasons').present?
-                  "#{"#{I18n.t('reason')}: " if reason_value}#{reason_value || I18n.t('digitally_signed_by')} " \
-                    "#{submitter.name}#{" <#{submitter.email}>" if submitter.email.present?}\n" \
+                  reason_line =
+                    "#{"#{I18n.t('reason')}: " if reason_value}#{reason_value || I18n.t('digitally_signed_by')} " \
+                    "#{submitter.name}#{" <#{submitter.email}>" if submitter.email.present?}"
+
+                  "#{TextUtils.maybe_rtl_reverse(reason_line)}\n" \
                     "#{I18n.l(signature_timestamp.in_time_zone(timezone), format: time_format)} " \
                     "#{TimeUtils.timezone_abbr(timezone, signature_timestamp)}"
                 else
@@ -509,7 +517,9 @@ module Submissions
                 cv.image(PdfIcons.paperclip_io, at: [0, 0], width: box.content_width)
               end
 
-              acc << HexaPDF::Layout::TextFragment.create("#{attachment.filename}\n", font:, font_size:)
+              acc << HexaPDF::Layout::TextFragment.create(
+                "#{TextUtils.maybe_rtl_reverse(attachment.filename.to_s)}\n", font:, font_size:
+              )
             end
 
             lines = layouter.fit(items, area['w'] * width, height).lines
@@ -589,7 +599,7 @@ module Submissions
             )
           when ->(type) { type == 'cells' && !area['cell_w'].to_f.zero? }
             cell_width = area['cell_w'] * width
-            cell_valign = field.dig('preferences', 'valign').to_s.presence || 'center'
+            cell_valign = field.dig('preferences', 'valign').to_s.presence_in(TEXT_VALIGNS) || 'center'
             cell_layouter = cell_layouters[cell_valign]
 
             if (mask = field.dig('preferences', 'mask').presence)

lib/submitters.rb

@@ -11,6 +11,7 @@ module Submitters
   }.freeze
 
   UnableToSendCode = Class.new(StandardError)
+  BouncedEmail = Class.new(UnableToSendCode)
   InvalidOtp = Class.new(StandardError)
   MaliciousFileExtension = Class.new(StandardError)
   ParamsError = Class.new(StandardError)
@@ -49,7 +50,7 @@ module Submitters
   end
 
   def fulltext_search_field(current_user, submitters, keyword, field_name)
-    keyword = keyword.delete("\0\\")
+    keyword = keyword.delete("\0").tr('\\', ' ').squish
 
     return submitters.none if keyword.blank?
 
@@ -143,7 +144,7 @@ module Submitters
   def normalize_preferences(account, user, params)
     preferences = {}
 
-    message_params = params['message'].presence || params.slice('subject', 'body').presence
+    message_params = (params['message'].presence || params.slice('subject', 'body')).compact_blank
 
     if message_params.present?
       email_message = EmailMessages.find_or_create_for_account_user(account, user,
@@ -243,6 +244,12 @@ module Submitters
   def send_shared_link_email_verification_code(submitter, request:)
     RateLimit.call("send-otp-code-#{request.remote_ip}", limit: 2, ttl: 45.seconds, enabled: true)
 
+    if Docuseal.multitenant? && email_bounced_recently?(submitter.email)
+      Rollbar.warning("Bounced OTP email for template: #{submitter.submission.template.id}") if defined?(Rollbar)
+
+      raise BouncedEmail, I18n.t(:verification_email_bounced)
+    end
+
     TemplateMailer.otp_verification_email(submitter.submission.template, email: submitter.email).deliver_later!
   rescue RateLimit::LimitApproached
     Rollbar.warning("Limit verification code for template: #{submitter.submission.template.id}") if defined?(Rollbar)
@@ -250,6 +257,11 @@ module Submitters
     raise UnableToSendCode, I18n.t('too_many_attempts')
   end
 
+  def email_bounced_recently?(email)
+    EmailEvent.exists?(email:, event_type: %w[bounce soft_bounce permanent_bounce],
+                       event_datetime: 24.hours.ago..Time.current)
+  end
+
   def verify_link_otp!(otp, submitter)
     return false if otp.blank?
 

lib/submitters/maybe_update_default_values.rb

@@ -5,14 +5,9 @@ module Submitters
     module_function
 
     def call(submitter, current_user)
-      user =
-        if current_user && current_user.email == submitter.email
-          current_user
-        else
-          submitter.account.users.find_by(email: submitter.email)
-        end
+      return if current_user.blank? || current_user.email != submitter.email
 
-      return if user.blank?
+      user = current_user
 
       fields = submitter.submission.template_fields || submitter.submission.template.fields
 

lib/submitters/start_form.rb

@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+module Submitters
+  module StartForm
+    COOKIES_TTL = 12.hours
+    START_FORM_COOKIES_TTL = 7.days
+    RESUBMIT_TTL = 3.days
+    COOKIES_DEFAULTS = { httponly: true, secure: Rails.env.production? }.freeze
+
+    NotSaved = Class.new(StandardError)
+
+    module_function
+
+    def can_resubmit?(submitter)
+      submitter.completed_at? && submitter.completed_at > RESUBMIT_TTL.ago &&
+        %w[api embed mcp].exclude?(submitter.submission.source) &&
+        submitter.account.account_configs.find_or_initialize_by(key: AccountConfig::ALLOW_TO_RESUBMIT).value != false
+    end
+
+    def can_reopen?(template, submitter, request:, current_user:)
+      return false if submitter.submission&.completed_at? && submitter.viewer?
+      return true if request.cookie_jar.encrypted[:start_form_slug] == submitter.slug
+      return true if request.cookie_jar.encrypted[:email_2fa_slug] == submitter.slug
+      return false if submitter.email.blank?
+      return true if submitter.completed_at?
+      return false if submitter.submission.source_embed?
+      return true if template.preferences['shared_link_2fa'] == true
+      return false if submitter.submission.source_link?
+      return true if current_user && submitter.email == current_user.email &&
+                     current_user.account_id == submitter.account_id
+
+      Docuseal.multitenant? || Accounts.can_send_emails?(template.account)
+    end
+
+    def assign_start_form_cookie(submitter, request)
+      request.cookie_jar.encrypted[:start_form_slug] =
+        { value: submitter.slug, expires: START_FORM_COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
+    end
+
+    def find_or_initialize_submitter(template, submitter_params, exclude_completed:, request:, current_user: nil)
+      required_fields = template.preferences.fetch('link_form_fields', ['email'])
+
+      required_params = required_fields.index_with { |key| submitter_params[key] }
+
+      find_params = required_params.except('name')
+
+      submitter =
+        if find_params.compact_blank.blank?
+          Submitter.new
+        else
+          build_submitters_scope(template, exclude_completed:).find_or_initialize_by(find_params)
+        end
+
+      if submitter.persisted? && !can_reopen?(template, submitter, request:, current_user:)
+        submitter = Submitter.new(find_params)
+      end
+
+      submitter.name = required_params['name'] if submitter.new_record?
+
+      submitter
+    end
+
+    def build_submitters_scope(template, exclude_completed: false, source: nil)
+      submissions = template.submissions.non_expired.active
+      submissions = submissions.where(source:) if source
+
+      Submitter
+        .where(submission: submissions)
+        .order(id: :desc)
+        .where(declined_at: nil)
+        .where(external_id: nil)
+        .then { |rel| exclude_completed ? rel.where(completed_at: nil) : rel }
+    end
+
+    def assign_submission_attributes(submitter, template, ip:, user_agent:, source: :link, resubmit_submitter: nil)
+      submitter.assign_attributes(
+        uuid: first_submitter_uuid(template),
+        ip:,
+        ua: user_agent,
+        values: resubmit_submitter&.preferences&.fetch('default_values', nil) || {},
+        preferences: resubmit_submitter&.preferences.presence || { 'send_email' => true },
+        metadata: resubmit_submitter&.metadata.presence || {}
+      )
+
+      submitter.assign_attributes(resubmit_submitter.slice(:name, :email, :phone)) if resubmit_submitter
+
+      if submitter.values.present?
+        resubmit_submitter.attachments.each do |attachment|
+          submitter.attachments << attachment.dup if submitter.values.value?(attachment.uuid)
+        end
+      end
+
+      submitter.submission ||= Submission.new(template:,
+                                              account_id: template.account_id,
+                                              template_submitters: template.submitters,
+                                              expire_at: Templates.build_default_expire_at(template),
+                                              submitters: [submitter],
+                                              source:)
+
+      Submissions::CreateFromSubmitters.maybe_set_dynamic_documents(submitter.submission)
+
+      submitter.account_id = submitter.submission.account_id
+
+      submitter
+    end
+
+    def first_submitter_uuid(template)
+      (Templates.filter_undefined_submitters(template.submitters).first || template.submitters.first)['uuid']
+    end
+
+    def verify_2fa_and_save_submitter(submitter, request, is_new_record:)
+      is_otp_verified = Submitters.verify_link_otp!(request.params[:one_time_code], submitter)
+
+      return false if !is_otp_verified && request.cookie_jar.encrypted[:email_2fa_slug] != submitter.slug
+
+      raise NotSaved unless submitter.save
+
+      enqueue_new_submitter_jobs(submitter) if is_new_record
+
+      assign_start_form_cookie(submitter, request)
+
+      if is_otp_verified
+        SubmissionEvents.create_with_tracking_data(submitter, 'email_verified', request)
+
+        request.cookie_jar.encrypted[:email_2fa_slug] =
+          { value: submitter.slug, expires: COOKIES_TTL.from_now, **COOKIES_DEFAULTS }
+      end
+
+      true
+    end
+
+    def enqueue_new_submitter_jobs(submitter)
+      WebhookUrls.enqueue_events(submitter.submission, 'submission.created')
+
+      SearchEntries.enqueue_reindex(submitter)
+
+      expire_at = submitter.submission.expire_at
+
+      return unless expire_at
+
+      ProcessSubmissionExpiredJob.perform_at(expire_at, 'submission_id' => submitter.submission_id,
+                                                        'expire_at' => expire_at.to_i)
+    end
+  end
+end

lib/submitters/submit_values.rb

@@ -8,6 +8,7 @@ module Submitters
     VARIABLE_REGEXP = /\{\{?(\w+)\}\}?/
     PHONE_REGEXP = /[+\d()\s-]+/
     NONEDITABLE_FIELD_TYPES = %w[stamp heading strikethrough].freeze
+    REQUIRED_FIELD_TYPES = %w[payment kba verification].freeze
 
     STRFTIME_MAP = {
       'hour' => '%-k',
@@ -95,7 +96,9 @@ module Submitters
       required_field_uuids_acc.each do |uuid|
         next if submitter.values[uuid].present?
 
-        raise RequiredFieldError, uuid if validate_required
+        if validate_required || submitter.submission.fields_uuid_index.dig(uuid, 'type').in?(REQUIRED_FIELD_TYPES)
+          raise RequiredFieldError, uuid
+        end
 
         Rollbar.warning("Required field #{submitter.id}: #{uuid}") if defined?(Rollbar)
       end

lib/templates/build_annotations.rb

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-module Templates
-  module BuildAnnotations
-    module_function
-
-    def call(data)
-      pdf = HexaPDF::Document.new(io: StringIO.new(data))
-
-      pdf.pages.flat_map.with_index do |page, index|
-        (page[:Annots] || []).filter_map do |annot|
-          next if annot.blank?
-          next if annot.is_a?(Integer) || annot.is_a?(Symbol) || annot.is_a?(HexaPDF::PDFArray)
-          next if annot[:A].blank? || annot[:A][:URI].blank?
-          next unless annot[:Subtype] == :Link
-          next if !annot[:A][:URI].starts_with?('https://') && !annot[:A][:URI].starts_with?('http://')
-
-          build_external_link_hash(page, annot).merge('page' => index)
-        end
-      end
-    rescue StandardError => e
-      Rollbar.error(e) if defined?(Rollbar)
-
-      []
-    end
-
-    def build_external_link_hash(page, annot)
-      left, bottom, right, top = annot[:Rect]
-
-      {
-        'type' => 'external_link',
-        'value' => annot[:A][:URI],
-        'x' => left / page.box.width.to_f,
-        'y' => (page.box.height - top) / page.box.height.to_f,
-        'w' => (right - left) / page.box.width.to_f,
-        'h' => (top - bottom) / page.box.height.to_f
-      }
-    end
-  end
-end

lib/templates/build_pdfium_annotations.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Templates
+  module BuildPdfiumAnnotations
+    URI_PREFIXES = %w[https:// http://].freeze
+    LINKS_LIMIT = 250
+
+    module_function
+
+    def call(doc)
+      annotations = []
+
+      doc.page_count.times do |page_index|
+        break if annotations.size >= LINKS_LIMIT
+        next if doc.annot_count(page_index).zero?
+
+        page = doc.get_page(page_index)
+        geometry = { box: page.box, rotation: page.rotation }
+
+        page.annotations.each do |annotation|
+          next unless annotation.link? && annotation.rect?
+
+          url = annotation.link.url
+
+          next if url.blank? || URI_PREFIXES.none? { |prefix| url.start_with?(prefix) }
+
+          annotations << build_external_link_hash(url, annotation, geometry).merge('page' => page_index)
+        end
+      end
+
+      annotations
+    rescue StandardError => e
+      Rollbar.error(e) if defined?(Rollbar)
+
+      raise if Rails.env.development?
+
+      []
+    end
+
+    def build_external_link_hash(url, area, geometry)
+      x, y, w, h, page_width, page_height = Pdfium.transform_rect(area.bounds, **geometry)
+
+      {
+        'type' => 'external_link',
+        'value' => url,
+        'x' => x / page_width,
+        'y' => y / page_height,
+        'w' => w / page_width,
+        'h' => h / page_height
+      }
+    end
+  end
+end

lib/templates/create_attachments.rb

@@ -41,13 +41,37 @@ module Templates
     def handle_pdf_or_image(template, file, document_data = nil, params = {}, extract_fields: false, metadata: {})
       document_data ||= file.read
 
-      if file.content_type == PDF_CONTENT_TYPE
-        document_data = maybe_decrypt_pdf_or_raise(document_data, params)
+      unless file.content_type == PDF_CONTENT_TYPE
+        document = create_document(template, file, document_data, metadata)
 
-        annotations =
-          document_data.size < ANNOTATIONS_SIZE_LIMIT ? Templates::BuildAnnotations.call(document_data) : []
+        return Templates::ProcessDocument.call(document, document_data, extract_fields:)
       end
 
+      doc = Pdfium::Document.open_bytes(document_data, params[:password])
+
+      document_data = decrypt_document(doc) if doc.encrypted?
+
+      annotations =
+        document_data.size < ANNOTATIONS_SIZE_LIMIT ? Templates::BuildPdfiumAnnotations.call(doc) : []
+
+      document = create_document(template, file, document_data, metadata, annotations)
+
+      Templates::ProcessDocument.call(document, document_data, extract_fields:, doc:)
+    rescue Pdfium::PasswordError
+      raise PdfEncrypted
+    ensure
+      doc&.close
+    end
+
+    def decrypt_document(doc)
+      io = StringIO.new
+
+      doc.save(io, flags: Pdfium::FPDF_REMOVE_SECURITY)
+
+      io.tap(&:rewind).read
+    end
+
+    def create_document(template, file, document_data, metadata, annotations = nil)
       sha256 = Base64.urlsafe_encode64(Digest::SHA256.digest(document_data))
 
       blob = ActiveStorage::Blob.create_and_upload!(
@@ -62,19 +86,7 @@ module Templates
         content_type: file.content_type
       )
 
-      document = template.documents.create!(blob:)
-
-      Templates::ProcessDocument.call(document, document_data, extract_fields:)
-    end
-
-    def maybe_decrypt_pdf_or_raise(data, params)
-      if data.size < ANNOTATIONS_SIZE_LIMIT && PdfUtils.encrypted?(data)
-        PdfUtils.decrypt(data, params[:password])
-      else
-        data
-      end
-    rescue HexaPDF::EncryptionError
-      raise PdfEncrypted
+      template.documents.create!(blob:)
     end
 
     def extract_zip_files(files)

lib/templates/find_acro_fields.rb

@@ -1,288 +0,0 @@
-# frozen_string_literal: true
-
-module Templates
-  module FindAcroFields
-    PDF_CONTENT_TYPE = 'application/pdf'
-
-    FIELD_NAME_REGEXP = /\A(?=.*\p{L})[\p{L}\d\s-]+\z/
-    SKIP_FIELD_DESCRIPTION = %w[undefined].freeze
-    SELECT_PLACEHOLDER_REGEXP = /\b(
-      Select      |
-      Choose      |
-      Wählen      |
-      Auswählen   |
-      Sélectionner|
-      Choisir     |
-      Seleccionar |
-      Elegir      |
-      Seleziona   |
-      Scegliere   |
-      Selecionar  |
-      Escolher
-    )\b/ix
-
-    DATE_FORMAT_REGEXP = %r{[myd]{2,4}[-\\/\s.][myd]{2,4}[-\\/\s.][myd]{2,4}}i
-
-    FIELD_ALIGNMENT = {
-      0 => 'left',
-      1 => 'center',
-      2 => 'right'
-    }.freeze
-
-    module_function
-
-    # rubocop:disable Metrics
-    def call(pdf, attachment, data)
-      return [] if pdf.acro_form.blank? && data.exclude?('/Form')
-
-      fields, annots_index = build_fields_with_pages(pdf)
-
-      fields.filter_map do |field|
-        areas = Array.wrap(field[:Kids] || field).filter_map do |child_field|
-          page = annots_index[child_field.hash]
-
-          next unless page
-
-          media_box = page[:CropBox] || page[:MediaBox]
-          crop_box = page[:CropBox] || media_box
-
-          media_box_start = [media_box[0], media_box[1]]
-          crop_shift = [crop_box[0] - media_box[0], crop_box[1] - media_box[1]]
-
-          next unless child_field[:Rect]
-
-          x0, y0, x1, y1 = child_field[:Rect]
-
-          x0, y0 = correct_coordinates(x0, y0, crop_shift, media_box_start)
-          x1, y1 = correct_coordinates(x1, y1, crop_shift, media_box_start)
-
-          page_width = media_box[2] - media_box[0]
-          page_height = media_box[3] - media_box[1]
-
-          x = x0
-          y = y0
-          w = x1 - x0
-          h = y1 - y0
-
-          transformed_y = page_height - y - h
-
-          attrs = {
-            page: page.index,
-            x: x / page_width.to_f,
-            y: transformed_y / page_height.to_f,
-            w: w / page_width.to_f,
-            h: h / page_height.to_f,
-            attachment_uuid: attachment.uuid
-          }
-
-          next if attrs[:w].zero? || attrs[:h].zero?
-
-          if child_field[:MaxLen] && child_field.try(:concrete_field_type) == :comb_text_field
-            attrs[:cell_w] = w / page_width.to_f / child_field[:MaxLen].to_f
-          end
-
-          attrs
-        end
-
-        next if areas.blank?
-
-        field_properties = build_field_properties(field)
-
-        next if field_properties.blank?
-        next if field_properties[:default_value].present?
-
-        if field_properties[:type].in?(%w[radio multiple])
-          if areas.size != field_properties[:options].size
-            field_properties[:options] = build_options(Array.new(areas.size, ''))
-          end
-
-          areas.each_with_index do |area, index|
-            area[:option_uuid] = field_properties[:options][index][:uuid]
-          end
-        end
-
-        {
-          uuid: SecureRandom.uuid,
-          required: field.flags.include?(:required),
-          preferences: {},
-          areas:,
-          **field_properties
-        }
-      end
-    rescue StandardError => e
-      raise if Rails.env.local?
-
-      Rollbar.error(e) if defined?(Rollbar)
-
-      []
-    end
-
-    def correct_coordinates(x_coord, y_coord, shift, media_box_start)
-      corrected_x = x_coord + shift[0] - media_box_start[0]
-      corrected_y = y_coord + shift[1] - media_box_start[1]
-
-      [corrected_x, corrected_y]
-    end
-
-    def build_field_properties(field)
-      field_name = field.full_field_name if field.full_field_name.to_s.match?(FIELD_NAME_REGEXP)
-
-      field_name = field_name&.encode('utf-8', invalid: :replace, undef: :replace, replace: '')
-
-      attrs = { name: field_name.to_s }
-      attrs[:description] = field[:TU] if field[:TU].present? &&
-                                          field[:TU] != field.full_field_name &&
-                                          !field[:TU].in?(SKIP_FIELD_DESCRIPTION)
-
-      if field[:Q].present? && field.field_type == :Tx
-        attrs[:preferences] ||= {}
-        attrs[:preferences][:align] = FIELD_ALIGNMENT.fetch(field[:Q], 'left')
-      end
-
-      if field.field_type == :Btn && field.concrete_field_type == :radio_button && field[:Opt].present?
-        selected_option_index = (field.allowed_values || []).find_index(field.field_value)
-        selected_option = field[:Opt][selected_option_index] if selected_option_index
-
-        {
-          **attrs,
-          type: 'radio',
-          options: build_options(field[:Opt], 'radio'),
-          default_value: selected_option
-        }
-      elsif field.field_type == :Btn && %i[check_box radio_button].include?(field.concrete_field_type) &&
-            field[:Kids].present? && field[:Kids].size > 1 && field.allowed_values.size > 1
-        selected_option = (field.allowed_values || []).find { |v| v == field.field_value }
-
-        return {} if field.allowed_values.include?(:BBox)
-
-        {
-          **attrs,
-          type: 'radio',
-          options: build_options(field.allowed_values, 'radio'),
-          default_value: selected_option
-        }
-      elsif field.field_type == :Btn && %i[check_box radio_button].include?(field.concrete_field_type)
-        {
-          **attrs,
-          type: 'checkbox',
-          default_value: field.field_value.present?
-        }
-      elsif field.field_type == :Ch &&
-            %i[combo_box editable_combo_box].include?(field.concrete_field_type) && field[:Opt].present?
-        {
-          **attrs,
-          type: 'select',
-          options: build_options(field[:Opt], 'select'),
-          default_value: field.field_value.to_s.match?(SELECT_PLACEHOLDER_REGEXP) ? nil : field.field_value
-        }
-      elsif field.field_type == :Ch && field.concrete_field_type == :multi_select && field[:Opt].present?
-        {
-          **attrs,
-          type: 'multiple',
-          options: build_options(field[:Opt], 'multiple'),
-          default_value: field.field_value
-        }
-      elsif field.field_type == :Tx && field.concrete_field_type == :comb_text_field
-        {
-          **attrs,
-          type: 'cells',
-          default_value: field.field_value
-        }
-      elsif field.field_type == :Tx
-        if field[:AA] && ((field[:AA][:F] && field[:AA][:F][:JS].include?('AFDate_')) ||
-            (field[:AA][:K] && field[:AA][:K][:JS].include?('AFDate_')))
-          if (format = field[:AA][:F][:JS][DATE_FORMAT_REGEXP])
-            attrs[:preferences] ||= {}
-            attrs[:preferences][:format] = format.upcase
-          end
-
-          {
-            **attrs,
-            type: 'date',
-            default_value: field.field_value
-          }
-        else
-          {
-            **attrs,
-            type: 'text',
-            default_value: field.field_value
-          }
-        end
-      elsif field.field_type == :Sig
-        {
-          **attrs,
-          type: field.try(:field_name).to_s.downcase.include?('initials') ? 'initials' : 'signature'
-        }
-      else
-        {}
-      end.compact
-    end
-
-    def build_options(values, type = nil)
-      is_skip_single_value = type.in?(%w[radio multiple]) && values.uniq.size == 1
-
-      values.filter_map do |option|
-        is_option_number = option.is_a?(Symbol) && option.to_s.match?(/\A\d+\z/)
-
-        option = option[1] if option.is_a?(Array) && option.size == 2
-
-        if option.is_a?(String) || option.is_a?(Symbol)
-          option = option.to_s.encode('utf-8', invalid: :replace, undef: :replace, replace: '')
-        end
-
-        next if type == 'select' && option.to_s.match?(SELECT_PLACEHOLDER_REGEXP)
-
-        {
-          uuid: SecureRandom.uuid,
-          value: is_option_number || is_skip_single_value ? '' : option
-        }
-      end
-    end
-
-    def build_fields_with_pages(pdf)
-      fields_index = {}
-      annots_index = {}
-
-      pdf.pages.each do |page|
-        page.each_annotation do |annot|
-          annots_index[annot.hash] = page
-
-          if !annot.key?(:Parent) && annot.key?(:FT)
-            fields_index[annot.hash] ||= HexaPDF::Type::AcroForm::Field.wrap(pdf, annot)
-          elsif annot.key?(:Parent)
-            field = annot[:Parent]
-            seen = Set.new.compare_by_identity
-
-            field = field[:Parent] while field[:Parent] && seen.add?(field.value)
-
-            annots_index[field.hash] ||= page
-            fields_index[field.hash] ||= HexaPDF::Type::AcroForm::Field.wrap(pdf, field)
-          end
-        end
-      end
-
-      [process_fields_array(pdf, fields_index.values), annots_index]
-    end
-
-    def process_fields_array(pdf, array, acc = [], seen = Set.new.compare_by_identity)
-      array.each_with_index do |field, index|
-        next if field.nil?
-
-        unless field.respond_to?(:type) && field.type == :XXAcroFormField
-          array[index] = field = HexaPDF::Type::AcroForm::Field.wrap(pdf, field)
-        end
-
-        next unless seen.add?(field.value)
-
-        if field.terminal_field?
-          acc << field
-        else
-          process_fields_array(pdf, field[:Kids], acc, seen)
-        end
-      end
-
-      acc
-    end
-    # rubocop:enable Metrics
-  end
-end

lib/templates/find_pdfium_acro_fields.rb

@@ -0,0 +1,255 @@
+# frozen_string_literal: true
+
+module Templates
+  module FindPdfiumAcroFields
+    DATE_JS_PREFIX = 'AFDate_'
+    SKIP_FIELD_TYPES = %i[unknown pushbutton].freeze
+    TEXT_OPERATOR_REGEXP = /\bT[jJ]\b/
+
+    FIELD_NAME_REGEXP = /\A(?=.*\p{L})[\p{L}\d\s-]+\z/
+    SKIP_FIELD_DESCRIPTION = %w[undefined].freeze
+    SELECT_PLACEHOLDER_REGEXP = /\b(
+      Select      |
+      Choose      |
+      Wählen      |
+      Auswählen   |
+      Sélectionner|
+      Choisir     |
+      Seleccionar |
+      Elegir      |
+      Seleziona   |
+      Scegliere   |
+      Selecionar  |
+      Escolher
+    )\b/ix
+
+    DATE_FORMAT_REGEXP = %r{[myd]{2,4}[-\\/\s.][myd]{2,4}[-\\/\s.][myd]{2,4}}i
+
+    FIELD_ALIGNMENT = {
+      0 => 'left',
+      1 => 'center',
+      2 => 'right'
+    }.freeze
+
+    module_function
+
+    def call(attachment, doc, data)
+      return [] if !doc.form? && data.exclude?('/Form')
+
+      pages = {}
+      widgets = []
+
+      doc.page_count.times do |page_index|
+        next if doc.annot_count(page_index).zero?
+
+        page = doc.get_page(page_index)
+
+        pages[page_index] = { box: page.box, rotation: page.rotation }
+
+        page.annotations.each do |annotation|
+          next unless annotation.widget? && annotation.rect?
+
+          field = annotation.field
+
+          next if field.nil? || field.type.in?(SKIP_FIELD_TYPES)
+
+          widgets << annotation
+        end
+      end
+
+      group_widgets(widgets).filter_map { |field_widgets| build_field(field_widgets, pages, attachment) }
+    rescue StandardError => e
+      Rollbar.error(e) if defined?(Rollbar)
+
+      raise if Rails.env.development?
+
+      []
+    end
+
+    def group_widgets(widgets)
+      widgets.group_by do |annotation|
+        field = annotation.field
+
+        if (field.control_count > 1 && field.own?) || field.detached? || (field.name.blank? && field.control_count <= 1)
+          [:widget, annotation.page_index, annotation.index]
+        else
+          [:field, field.type, field.name]
+        end
+      end.values
+    end
+
+    def build_field(widgets, pages, attachment)
+      widgets = widgets.sort_by.with_index { |annotation, index| [annotation.field.control_index, index] }
+
+      areas = widgets.filter_map { |annotation| build_area(annotation, pages[annotation.page_index], attachment) }
+
+      return if areas.blank?
+
+      field_properties = build_field_properties(widgets)
+
+      return if field_properties.blank?
+      return if field_properties[:default_value].present?
+
+      if field_properties[:type] == 'radio'
+        if areas.size != field_properties[:options].size
+          field_properties[:options] = build_options(Array.new(areas.size, ''))
+        end
+
+        areas.each_with_index do |area, index|
+          area[:option_uuid] = field_properties[:options][index][:uuid]
+        end
+      end
+
+      {
+        uuid: SecureRandom.uuid,
+        required: widgets.first.field.required?,
+        preferences: {},
+        areas:,
+        **field_properties
+      }
+    end
+
+    def build_area(annotation, page, attachment)
+      x, y, w, h, page_width, page_height = Pdfium.transform_rect(annotation.bounds, **page)
+
+      attrs = {
+        page: annotation.page_index,
+        x: x / page_width,
+        y: y / page_height,
+        w: w / page_width,
+        h: h / page_height,
+        attachment_uuid: attachment.uuid
+      }
+
+      return if attrs[:w].zero? || attrs[:h].zero?
+
+      field = annotation.field
+
+      attrs[:cell_w] = attrs[:w] / field.max_len if field.comb? && field.max_len.to_f.positive?
+
+      attrs
+    end
+
+    def build_field_properties(widgets)
+      field = widgets.first.field
+
+      field_name = field.name if field.name.match?(FIELD_NAME_REGEXP)
+
+      attrs = { name: field_name.to_s }
+      attrs[:description] = field.alternate_name if field.alternate_name.present? &&
+                                                    field.alternate_name != field.name &&
+                                                    !field.alternate_name.in?(SKIP_FIELD_DESCRIPTION)
+
+      case field.type
+      when :checkbox, :radio
+        build_button_properties(attrs, widgets)
+      when :combobox
+        build_select_properties(attrs, widgets.first)
+      when :text
+        build_text_properties(attrs, field)
+      when :signature
+        {
+          **attrs,
+          type: field.name.to_s.downcase.include?('initials') ? 'initials' : 'signature'
+        }
+      else
+        {}
+      end.compact
+    end
+
+    def build_button_properties(attrs, widgets)
+      field = widgets.first.field
+      options = widgets.find { |w| w.field.options.present? }&.field&.options.to_a
+      checked = widgets.find { |w| w.field.checked? }
+      export_values = widgets.filter_map { |w| w.field.export_value.presence }.uniq
+
+      if field.type == :radio && options.present?
+        {
+          **attrs,
+          type: 'radio',
+          options: build_options(options, 'radio'),
+          default_value: checked && options[checked.field.control_index]
+        }
+      elsif field.control_count > 1 && export_values.size > 1
+        {
+          **attrs,
+          type: 'radio',
+          options: build_options(export_values.map(&:to_sym), 'radio'),
+          default_value: checked&.field&.export_value.presence
+        }
+      else
+        {
+          **attrs,
+          type: 'checkbox',
+          default_value: checked.present?
+        }
+      end
+    end
+
+    def build_select_properties(attrs, annotation)
+      field = annotation.field
+
+      return {} if field.options.blank?
+
+      value = field.value.presence if renders_text?(annotation)
+
+      {
+        **attrs,
+        type: 'select',
+        options: build_options(field.options, 'select'),
+        default_value: value.to_s.match?(SELECT_PLACEHOLDER_REGEXP) ? nil : value
+      }
+    end
+
+    def renders_text?(annotation)
+      appearance = annotation.page.with_annotation(annotation.index, &:appearance)
+
+      appearance.to_s.match?(TEXT_OPERATOR_REGEXP)
+    end
+
+    def build_text_properties(attrs, field)
+      preferences = { align: FIELD_ALIGNMENT.fetch(field.quadding.to_i, 'left') }
+
+      attrs = { **attrs, preferences: }
+
+      if field.comb?
+        { **attrs, type: 'cells', default_value: field.value.presence }
+      elsif date?(field)
+        format = [field.format_js, field.keystroke_js].compact
+                                                      .filter_map { |js| js[DATE_FORMAT_REGEXP] }
+                                                      .first
+
+        preferences[:format] = format.upcase if format
+
+        { **attrs, type: 'date', default_value: field.value.presence }
+      else
+        { **attrs, type: 'text', default_value: field.value.presence }
+      end
+    end
+
+    def date?(field)
+      field.format_js.to_s.include?(DATE_JS_PREFIX) || field.keystroke_js.to_s.include?(DATE_JS_PREFIX)
+    end
+
+    def build_options(values, type = nil)
+      is_skip_single_value = type.in?(%w[radio multiple]) && values.uniq.size == 1
+
+      values.filter_map do |option|
+        is_option_number = option.is_a?(Symbol) && option.to_s.match?(/\A\d+\z/)
+
+        option = option[1] if option.is_a?(Array) && option.size == 2
+
+        if option.is_a?(String) || option.is_a?(Symbol)
+          option = option.to_s.encode('utf-8', invalid: :replace, undef: :replace, replace: '')
+        end
+
+        next if type == 'select' && option.to_s.match?(SELECT_PLACEHOLDER_REGEXP)
+
+        {
+          uuid: SecureRandom.uuid,
+          value: is_option_number || is_skip_single_value ? '' : option.presence
+        }
+      end
+    end
+  end
+end

lib/templates/modify_documents.rb

@@ -345,10 +345,7 @@ module Templates
 
       uuid = pdf_ref['attachment_uuid']
       source = sources[[uuid, nil]] ||= open_or_build_pdf(attachments_index[uuid])
-      page = source.get_page(pdf_ref['page'])
-
-      width = page.width
-      height = page.height
+      width, height = source.page_size(pdf_ref['page'])
 
       width, height = height, width unless (pdf_ref['rotate'].to_i % 180).zero?
 
@@ -435,7 +432,9 @@ module Templates
     end
 
     def save_document(template, old_attachment, data)
-      annotations = data.size < ANNOTATIONS_SIZE_LIMIT ? Templates::BuildAnnotations.call(data) : []
+      doc = Pdfium::Document.open_io(StringIO.new(data))
+
+      annotations = data.size < ANNOTATIONS_SIZE_LIMIT ? Templates::BuildPdfiumAnnotations.call(doc) : []
       sha256 = Base64.urlsafe_encode64(Digest::SHA256.digest(data))
 
       blob = ActiveStorage::Blob.create_and_upload!(
@@ -448,7 +447,9 @@ module Templates
 
       document = template.documents.create!(blob:)
 
-      Templates::ProcessDocument.call(document, data)
+      Templates::ProcessDocument.call(document, data, doc:)
+    ensure
+      doc&.close
     end
 
     def remap_fields(template, mapping)

lib/templates/process_document.rb

@@ -19,15 +19,13 @@ module Templates
 
     module_function
 
-    def call(attachment, data, extract_fields: false, max_pages: MAX_NUMBER_OF_PAGES_PROCESSED)
+    def call(attachment, data, extract_fields: false, max_pages: MAX_NUMBER_OF_PAGES_PROCESSED, doc: nil)
       if attachment.content_type == PDF_CONTENT_TYPE
         if extract_fields && data.size < MAX_FLATTEN_FILE_SIZE
-          pdf = HexaPDF::Document.new(io: StringIO.new(data))
-
-          fields = Templates::FindAcroFields.call(pdf, attachment, data)
+          fields = Templates::FindPdfiumAcroFields.call(attachment, doc, data)
         end
 
-        generate_pdf_preview_images(attachment, data, pdf, max_pages:)
+        generate_pdf_preview_images(attachment, data, max_pages:, doc:)
 
         attachment.metadata['pdf']['fields'] = fields if fields
       elsif attachment.image?
@@ -37,19 +35,13 @@ module Templates
       attachment
     end
 
-    def process(attachment, data, extract_fields: false)
+    def process(attachment, data, doc:, extract_fields: false)
       if attachment.content_type == PDF_CONTENT_TYPE && extract_fields && data.size < MAX_FLATTEN_FILE_SIZE
-        pdf = HexaPDF::Document.new(io: StringIO.new(data))
-
-        fields = Templates::FindAcroFields.call(pdf, attachment, data)
+        fields = Templates::FindPdfiumAcroFields.call(attachment, doc, data)
       end
 
-      pdf ||= HexaPDF::Document.new(io: StringIO.new(data))
-
-      number_of_pages = pdf.pages.size
-
       attachment.metadata['pdf'] ||= {}
-      attachment.metadata['pdf']['number_of_pages'] = number_of_pages
+      attachment.metadata['pdf']['number_of_pages'] = doc.page_count
       attachment.metadata['pdf']['fields'] = fields if fields
 
       attachment
@@ -76,13 +68,10 @@ module Templates
       )
     end
 
-    def generate_pdf_preview_images(attachment, data, pdf = nil, max_pages: MAX_NUMBER_OF_PAGES_PROCESSED)
+    def generate_pdf_preview_images(attachment, data, doc:, max_pages: MAX_NUMBER_OF_PAGES_PROCESSED)
       ActiveStorage::Attachment.where(name: ATTACHMENT_NAME, record: attachment).destroy_all
 
-      pdf ||= HexaPDF::Document.new(io: StringIO.new(data))
-      number_of_pages = pdf.pages.size
-
-      data = maybe_flatten_form(data, pdf)
+      number_of_pages = doc.page_count
 
       attachment.metadata['pdf'] ||= {}
       attachment.metadata['pdf']['number_of_pages'] = number_of_pages
@@ -93,11 +82,11 @@ module Templates
 
       max_pages_to_process = data.size < GENERATE_PREVIEW_SIZE_LIMIT ? max_pages : 1
 
-      generate_document_preview_images(attachment, data, 0..[number_of_pages - 1, max_pages_to_process].min)
+      generate_document_preview_images(attachment, 0..[number_of_pages - 1, max_pages_to_process].min, doc:)
     end
 
-    def generate_document_preview_images(attachment, data, range, concurrency: CONCURRENCY)
-      doc = Pdfium::Document.open_bytes(data)
+    def generate_document_preview_images(attachment, range, doc:, concurrency: CONCURRENCY)
+      flatten_pages = doc.form?
 
       pool = Concurrent::FixedThreadPool.new(concurrency)
 
@@ -105,6 +94,9 @@ module Templates
         range.map do |page_number|
           doc_page = doc.get_page(page_number)
 
+          hide_placeholder_widgets(doc_page, hide_empty: !flatten_pages)
+          doc_page.flatten if flatten_pages
+
           bytes, width, height = doc_page.render_to_bitmap(width: MAX_WIDTH)
 
           image = Vips::Image.new_from_memory_copy(bytes, width, height, 4, :uchar)
@@ -126,10 +118,30 @@ module Templates
         end
       end
     ensure
-      doc&.close
       pool&.kill
     end
 
+    def hide_placeholder_widgets(page, hide_empty: true)
+      page.annotations.each do |annotation|
+        next unless annotation.widget?
+
+        page.with_annotation(annotation.index) do |handle|
+          next if handle.field_type != Pdfium::FPDF_FORMFIELD_COMBOBOX
+
+          value = handle.field_value.to_s
+
+          if value.blank?
+            next unless hide_empty
+          elsif handle.option_labels.blank? ||
+                !value.match?(FindPdfiumAcroFields::SELECT_PLACEHOLDER_REGEXP)
+            next
+          end
+
+          handle.hide!
+        end
+      end
+    end
+
     def build_and_upload_blob(image, page_number, format = FORMAT)
       image = image.copy(interpretation: :srgb)
 
@@ -153,33 +165,6 @@ module Templates
       blob
     end
 
-    def maybe_flatten_form(data, pdf)
-      return data if data.size > MAX_FLATTEN_FILE_SIZE
-      return data if pdf.acro_form.blank?
-
-      io = StringIO.new
-
-      pdf.acro_form.each_field do |field|
-        next if field.field_type != :Ch ||
-                field[:Opt].blank? ||
-                %i[combo_box editable_combo_box].exclude?(field.concrete_field_type) ||
-                !field.field_value.to_s.match?(FindAcroFields::SELECT_PLACEHOLDER_REGEXP)
-
-        field[:V] = ''
-      end
-
-      pdf.acro_form.create_appearances(force: true) if pdf.acro_form[:NeedAppearances]
-      pdf.acro_form.flatten
-
-      pdf.write(io, incremental: false, validate: false)
-
-      io.string
-    rescue StandardError
-      raise if Rails.env.development?
-
-      data
-    end
-
     def normalize_attachment_fields(template, attachments = template.documents)
       attachments.flat_map do |a|
         pdf_fields = a.metadata['pdf'].delete('fields').to_a if a.metadata['pdf'].present?

lib/verify_pdf_signature.rb

@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+module VerifyPdfSignature
+  COMMON_NAME = 'CN'
+  TIME_FORMAT = '%Y%m%d%H%M%S%z'
+
+  SignatureStruct = Struct.new(:messages, :reason, :signing_time, :common_name, :type)
+  MessageStruct = Struct.new(:text, :status)
+
+  module_function
+
+  def call(io, trusted_certs)
+    Pdfium::Document.open_io(io) do |document|
+      signatures = document.signatures.select { |e| e.byte_range.any?(&:positive?) && e.contents.present? }
+
+      next [] if signatures.blank?
+
+      verified_signatures = signatures.select { |e| verified_signature?(e, io, trusted_certs) }
+      trusted_signatures = verified_signatures.select { |e| trusted_signature?(e, trusted_certs) }
+      last_signature = (trusted_signatures.presence || verified_signatures).max_by(&:signed_end)
+      has_unsigned_changes = last_signature && unsigned_changes?(document, io, last_signature.signed_end)
+
+      signatures.map do |signature|
+        build_signature(signature, trusted_certs,
+                        verified: verified_signatures.include?(signature),
+                        has_unsigned_changes: has_unsigned_changes && signature == last_signature)
+      end
+    end
+  end
+
+  def verified_signature?(signature, io, trusted_certs)
+    return false unless covers_signed_revision?(signature, io)
+
+    verify_contents(OpenSSL::PKCS7.new(signature.contents), signed_data(io, signature.byte_range), trusted_certs)
+  rescue OpenSSL::PKCS7::PKCS7Error
+    false
+  end
+
+  def build_signature(signature, trusted_certs, verified:, has_unsigned_changes:)
+    pkcs7 = OpenSSL::PKCS7.new(signature.contents)
+
+    SignatureStruct.new(
+      messages: build_messages(pkcs7, verified, trusted_certs, has_unsigned_changes),
+      reason: signature.reason,
+      signing_time: signing_time(pkcs7, signature),
+      common_name: common_name(pkcs7),
+      type: signature.sub_filter
+    )
+  rescue OpenSSL::PKCS7::PKCS7Error
+    SignatureStruct.new(
+      messages: [MessageStruct.new(text: I18n.t('signature_verification_failed'), status: :error)],
+      reason: signature.reason,
+      signing_time: parse_time(signature.time),
+      type: signature.sub_filter
+    )
+  end
+
+  def build_messages(pkcs7, verified, trusted_certs, has_unsigned_changes)
+    messages =
+      if verified
+        [MessageStruct.new(text: I18n.t('signature_valid'), status: :success),
+         certificate_message(pkcs7, trusted_certs)]
+      else
+        [MessageStruct.new(text: I18n.t('signature_verification_failed'), status: :error)]
+      end
+
+    if has_unsigned_changes
+      messages << MessageStruct.new(text: I18n.t('contains_unsigned_changes_after_the_last_signature'),
+                                    status: :warning)
+    end
+
+    messages << MessageStruct.new(text: "Certificate chain: #{certificate_chain(pkcs7).join(' -> ')}")
+  end
+
+  def certificate_message(pkcs7, trusted_certs)
+    if trusted_certificate?(pkcs7, trusted_certs)
+      MessageStruct.new(text: I18n.t('signed_with_trusted_certificate'), status: :success)
+    else
+      MessageStruct.new(text: I18n.t('signed_with_external_certificate'), status: :error)
+    end
+  end
+
+  def trusted_signature?(signature, trusted_certs)
+    trusted_certificate?(OpenSSL::PKCS7.new(signature.contents), trusted_certs)
+  rescue OpenSSL::PKCS7::PKCS7Error
+    false
+  end
+
+  def trusted_certificate?(pkcs7, trusted_certs)
+    public_key = signer_certificate(pkcs7)&.public_key&.to_der
+
+    trusted_certs.any? { |e| e.public_key.to_der == public_key }
+  end
+
+  def verify_contents(pkcs7, signed_data, trusted_certs)
+    return false if digest_algorithms(pkcs7).blank?
+
+    store = OpenSSL::X509::Store.new
+    store.set_default_paths
+    store.purpose = OpenSSL::X509::PURPOSE_SMIME_SIGN
+    store.verify_callback = ->(_success, _context) { true }
+    trusted_certs.each { |cert| store.add_cert(cert) }
+
+    pkcs7.verify(pkcs7.certificates, store, signed_data,
+                 OpenSSL::PKCS7::DETACHED | OpenSSL::PKCS7::BINARY)
+  end
+
+  def digest_algorithms(pkcs7)
+    OpenSSL::ASN1.decode(pkcs7.to_der).value[1].value[0].value[1].value
+  end
+
+  def common_name(pkcs7)
+    cert = signer_certificate(pkcs7)
+
+    return if cert.nil?
+
+    cert.subject.to_a.assoc(COMMON_NAME)&.dig(1)
+  end
+
+  def signer_certificate(pkcs7)
+    info = pkcs7.signers.first
+
+    pkcs7.certificates&.find { |cert| cert.issuer == info.issuer && cert.serial == info.serial }
+  end
+
+  def certificate_chain(pkcs7)
+    signer = signer_certificate(pkcs7)
+
+    return [] if signer.nil?
+
+    certs = [signer]
+
+    while (issuer = pkcs7.certificates.find { |cert| cert.subject == certs.last.issuer })
+      break if certs.include?(issuer)
+
+      certs << issuer
+    end
+
+    certs.map { |cert| cert.subject.to_a.assoc(COMMON_NAME)&.dig(1) }
+  end
+
+  def signing_time(pkcs7, signature)
+    cms_signing_time(pkcs7) || parse_time(signature.time)
+  end
+
+  def cms_signing_time(pkcs7)
+    pkcs7.signers.first&.signed_time
+  rescue StandardError
+    nil
+  end
+
+  def parse_time(value)
+    return if value.blank?
+
+    time = value.delete("'").delete_prefix('D:')
+    offset = time[14..].to_s
+
+    Time.strptime("#{time.first(14)}#{offset.start_with?('+', '-') ? offset : '+0000'}", TIME_FORMAT)
+  end
+
+  def covers_signed_revision?(signature, io)
+    byte_range = signature.byte_range
+
+    return false if byte_range.size != 4 || byte_range.any?(&:negative?) || byte_range[0].positive?
+    return false if signature.signed_end > io.size
+
+    byte_range[2] == byte_range[1] + (signature.contents.bytesize * 2) + 2
+  end
+
+  def unsigned_changes?(document, io, signed_end)
+    return false if document.trailer_ends.none? { |offset| offset > signed_end }
+
+    io.seek(0)
+
+    Pdfium::Document.open_bytes(io.read(signed_end)) do |signed_document|
+      next true unless signed_document.valid_cross_reference_table?
+
+      serialized_document(signed_document) != serialized_document(document)
+    end
+  end
+
+  def serialized_document(document)
+    pages = (0...document.page_count).map do |index|
+      page = document.get_page(index)
+      objects = page.objects.map { |object| [*object.to_a, image_digest(page, object)] }
+
+      [page.rotation, objects, page.annotations, page.text]
+    end
+
+    [pages, document.bookmarks]
+  end
+
+  def image_digest(page, object)
+    return unless object.image?
+
+    Digest::SHA256.hexdigest(page.extract_image_bitmap(object.object_ptr)[:data])
+  end
+
+  def signed_data(io, byte_range)
+    byte_range.each_slice(2).map do |offset, length|
+      io.seek(offset)
+      io.read(length.clamp(0, [io.size - offset, 0].max))
+    end.join
+  end
+end

spec/factories/templates.rb

@@ -42,7 +42,11 @@ FactoryBot.define do
           record: template
         )
 
-        Templates::ProcessDocument.call(attachment, attachment.download)
+        data = attachment.download
+
+        Pdfium::Document.open_io(StringIO.new(data)) do |doc|
+          Templates::ProcessDocument.call(attachment, data, doc:)
+        end
 
         template.schema << {
           attachment_uuid: attachment.uuid,

spec/requests/submissions_spec.rb

@@ -197,7 +197,7 @@ describe 'Submission API' do
       expect(response.parsed_body).to eq({ 'error' => 'Defined more signing parties than in template' })
     end
 
-    it 'returns an error if the message has no body value' do
+    it 'creates a submission when the message has only a subject' do
       post '/api/submissions', headers: { 'x-auth-token': author.access_token.token }, params: {
         template_id: templates[0].id,
         send_email: true,
@@ -209,8 +209,13 @@ describe 'Submission API' do
         }
       }.to_json
 
-      expect(response).to have_http_status(:unprocessable_content)
-      expect(response.parsed_body).to eq({ 'error' => 'body is required in `message`.' })
+      expect(response).to have_http_status(:ok)
+
+      submission = Submission.last
+      email_message = EmailMessage.last
+
+      expect(submission.submitters.first.preferences['email_message_uuid']).to eq(email_message.uuid)
+      expect(email_message).to have_attributes(subject: 'Custom Email Subject', body: '')
     end
   end
 

spec/system/signing_form_spec.rb

@@ -1153,9 +1153,10 @@ RSpec.describe 'Signing Form' do
       click_on 'next'
       draw_canvas
 
-      expect do
-        click_on 'Sign and Complete'
-      end.to change(ProcessSubmitterCompletionJob.jobs, :size).by(1)
+      click_on 'Sign and Complete'
+
+      expect(page).to have_content('Document has been signed!')
+      expect(ProcessSubmitterCompletionJob.jobs.size).to eq(1)
     end
   end