Auto dispatch emails

app/controllers/api/base_controller.rb

@@ -24,7 +24,7 @@ def require_api_authentication
       head :unauthorized
 
     elsif params["controller"] == "api/v2/pushes"
-      if %w[audit active expired].include?(params["action"])
+      if %w[audit active expired notify_by_email].include?(params["action"])
         # These v2 endpoints require a valid token
         head :unauthorized
       end

app/controllers/api/v1/pushes_controller.rb

@@ -153,6 +153,10 @@ def create
     # when creating file pushes / uploading attachments.
     authenticate_user! if requires_authentication_for_create?(permitted_params)
 
+    # Extract notify_by_email params before creating the Push
+    # to avoid ActiveModel::UnknownAttributeError
+    permitted_notify_by_email_params = permitted_params.delete(:notify_by_email)
+
     @push = Push.new(permitted_params)
 
     if !permitted_params[:kind].present?
@@ -171,13 +175,19 @@ def create
       end
     end
 
-    @push.user = current_user if user_signed_in?
+    if user_signed_in?
+      @push.user = current_user
+    end
+
+    # Handle nested notify_by_email params
+    assign_notify_by_email_params(@push, permitted_notify_by_email_params) if permitted_notify_by_email_params.present?
 
     assign_deletable_by_viewer(@push, permitted_params)
     assign_retrieval_step(@push, permitted_params)
 
     if @push.save
       log_creation(@push)
+      log_creation_email_send(@push) if permitted_notify_by_email_params.present?
 
       render template: "pushes/show", status: :created
     else
@@ -267,7 +277,11 @@ def audit
       .per(50)
 
     @secret_url = helpers.secret_url(@push)
-    render json: {views: @audit_logs}.to_json(except: %i[user_id push_id id])
+    if params["controller"] == "api/v2/pushes"
+      render template: "pushes/audit", status: :ok
+    else
+      render json: {views: @audit_logs}.to_json(except: %i[user_id push_id id])
+    end
   end
 
   api :DELETE, "/p/:url_token.json", "Expire a push: delete the payload and expire the secret URL."
@@ -455,7 +469,12 @@ def validate_page_parameter
   end
 
   def set_push
-    @push = Push.includes(:audit_logs).find_by!(url_token: params[:id])
+    @push = if action_name == "audit"
+      # If notify_by_email is included unnecessarily, it will cause memory usage unnecessarily.
+      Push.includes(audit_logs: :notify_by_email).find_by!(url_token: params[:id])
+    else
+      Push.includes(:audit_logs).find_by!(url_token: params[:id])
+    end
   rescue ActiveRecord::RecordNotFound
     # Showing a 404 reveals that this Secret URL never existed
     # which is an information leak (not a secret anymore)
@@ -499,4 +518,11 @@ def push_params
 
     raise e
   end
+
+  def assign_notify_by_email_params(push, permitted_params, required: false)
+    push.notify_by_email_recipients = permitted_params[:recipients]
+    push.notify_by_email_locale = permitted_params[:locale]
+    push.notify_by_email_creator = current_user if user_signed_in?
+    push.notify_by_email_required = required
+  end
 end

app/controllers/api/v2/pushes_controller.rb

@@ -3,15 +3,39 @@
 class Api::V2::PushesController < Api::V1::PushesController
   before_action :force_json_format
 
+  before_action :set_push, only: %i[show preview audit destroy notify_by_email]
+
+  def notify_by_email
+    authenticate_user!
+
+    if @push.user != current_user
+      render json: {error: I18n._("That push doesn't belong to you.")}, status: :forbidden
+      return
+    end
+
+    assign_notify_by_email_params(@push, notify_by_email_params, required: true)
+
+    if @push.valid?
+      log_creation_email_send(@push)
+      render json: {}, status: :created
+    else
+      render json: @push.errors, status: :unprocessable_entity
+    end
+  end
+
   private
 
   def force_json_format
     request.format = :json
   end
 
+  def notify_by_email_params
+    params.permit(:recipients, :locale)
+  end
+
   def push_params
     permitted = params.require(:push).permit(:name, :kind, :expire_after_days, :expire_after_views,
-      :deletable_by_viewer, :retrieval_step, :payload, :note, :passphrase, files: [])
+      :deletable_by_viewer, :retrieval_step, :payload, :note, :passphrase, notify_by_email: [:recipients, :locale], files: [])
 
     # For v2 requests, file uploads imply a file push unless kind is explicit.
     if permitted[:kind].blank? && permitted[:files].present?

app/controllers/api/v2/version_controller.rb

@@ -21,7 +21,7 @@ def features
       },
       pushes: {
         enabled: true,
-        email_auto_dispatch: false,
+        email_auto_dispatch: Settings.notify_by_email_available?,
         file_attachments: {
           enabled: Settings.enable_file_pushes,
           requires_authentication: true

app/controllers/concerns/log_events.rb

@@ -23,6 +23,19 @@ def log_creation(push)
     log_event(push, :creation)
   end
 
+  def log_creation_email_send(push)
+    return unless push.notify_by_email_recipients.present?
+
+    ip, user_agent, referrer = log_info
+    audit_log = push.audit_logs.build(kind: :creation_email_send, user: current_user, ip:, user_agent:, referrer:)
+
+    recipients = push.notify_by_email_recipients
+    locale = push.notify_by_email_locale
+    audit_log.build_notify_by_email(recipients: recipients, locale: locale)
+
+    audit_log.save!
+  end
+
   def log_update(push)
     log_event(push, :edit)
   end
@@ -38,13 +51,19 @@ def log_expire(push)
   def log_event(push, kind)
     return if audit_log_limit_reached?(push.audit_logs)
 
+    ip, user_agent, referrer = log_info
+
+    push.audit_logs.create(kind: kind, user: current_user, ip:, user_agent:, referrer:)
+  end
+
+  def log_info
     ip = request.env["HTTP_X_FORWARDED_FOR"].blank? ? request.env["REMOTE_ADDR"] : request.env["HTTP_X_FORWARDED_FOR"]
 
     # Limit retrieved values to 256 characters
     user_agent = request.env["HTTP_USER_AGENT"].to_s[0, 255]
     referrer = request.env["HTTP_REFERER"].to_s[0, 255]
 
-    push.audit_logs.create(kind: kind, user: current_user, ip:, user_agent:, referrer:)
+    [ip, user_agent, referrer]
   end
 
   private

app/controllers/madmin/notify_by_emails_controller.rb

@@ -0,0 +1,4 @@
+module Madmin
+  class NotifyByEmailsController < Madmin::ResourceController
+  end
+end

app/controllers/pushes_controller.rb

@@ -130,9 +130,11 @@ def create
 
     assign_deletable_by_viewer(@push, push_params)
     assign_retrieval_step(@push, push_params)
+    assign_notify_by_email_params(@push, notify_by_email_params)
 
     if @push.save
       log_creation(@push)
+      log_creation_email_send(@push)
 
       redirect_to preview_push_path(@push)
     else
@@ -244,6 +246,27 @@ def preview
     @qr_code = helpers.qr_code(@secret_url)
   end
 
+  def notify_by_email
+    authenticate_user!
+
+    if @push.user_id != current_user.id
+      redirect_to :root, notice: I18n._("That push doesn't belong to you.")
+      return
+    end
+
+    assign_notify_by_email_params(@push, notify_by_email_params, required: true)
+
+    if @push.valid?
+      log_creation_email_send(@push)
+      redirect_to preview_push_path(@push), notice: I18n._("Recipient(s) are added to the queue to be sent.")
+    else
+      @secret_url = helpers.secret_url(@push)
+      @qr_code = helpers.qr_code(@secret_url)
+
+      render action: "preview", status: :unprocessable_content
+    end
+  end
+
   def print_preview
     @secret_url = helpers.secret_url(@push)
     @qr_code = helpers.qr_code(@secret_url)
@@ -362,7 +385,12 @@ def clear_flash_for_delivery_pages
   end
 
   def set_push
-    @push = Push.includes(:audit_logs).find_by!(url_token: params[:id])
+    @push = if action_name == "audit"
+      # If notify_by_email is included unnecessarily, it will cause memory usage unnecessarily.
+      Push.includes(audit_logs: :notify_by_email).find_by!(url_token: params[:id])
+    else
+      Push.includes(:audit_logs).find_by!(url_token: params[:id])
+    end
   rescue ActiveRecord::RecordNotFound
     # Showing a 404 reveals that this Secret URL never existed
     # which is an information leak (not a secret anymore)
@@ -379,34 +407,30 @@ def set_push
   end
 
   def push_params
+    base = %i[kind name expire_after_days expire_after_views retrieval_step payload note passphrase]
     case params.dig(:push, :kind)
     when "url"
-      params.require(:push).permit(:kind, :name, :expire_after_days, :expire_after_views,
-        :retrieval_step, :payload, :note, :passphrase)
+      params.require(:push).permit(*base)
     when "file"
-      params.require(:push).permit(:kind, :name, :expire_after_days, :expire_after_views, :deletable_by_viewer,
-        :retrieval_step, :payload, :note, :passphrase, files: [])
+      params.require(:push).permit(*(base + [:deletable_by_viewer, {files: []}]))
     else
-      params.require(:push).permit(:kind, :name, :expire_after_days, :expire_after_views, :deletable_by_viewer,
-        :retrieval_step, :payload, :note, :passphrase)
+      params.require(:push).permit(*(base + [:deletable_by_viewer]))
     end
   rescue => e
     Rails.logger.error("Error in push_params: #{e.message}")
     raise e
   end
 
   def update_params
+    base = %i[name expire_after_days expire_after_views retrieval_step payload note passphrase]
     # Don't allow kind to be changed after creation for security
     case @push.kind
     when "url"
-      params.require(:push).permit(:name, :expire_after_days, :expire_after_views,
-        :retrieval_step, :payload, :note, :passphrase)
+      params.require(:push).permit(*base)
     when "file"
-      params.require(:push).permit(:name, :expire_after_days, :expire_after_views, :deletable_by_viewer,
-        :retrieval_step, :payload, :note, :passphrase, files: [])
+      params.require(:push).permit(*(base + [:deletable_by_viewer, {files: []}]))
     else
-      params.require(:push).permit(:name, :expire_after_days, :expire_after_views, :deletable_by_viewer,
-        :retrieval_step, :payload, :note, :passphrase)
+      params.require(:push).permit(*(base + [:deletable_by_viewer]))
     end
   rescue => e
     Rails.logger.error("Error in update_params: #{e.message}")
@@ -458,7 +482,7 @@ def check_allowed
       return
     end
 
-    @push_kind = if %w[preview print_preview preliminary passphrase access show expire audit edit update delete_file].include?(action_name)
+    @push_kind = if %w[preview print_preview preliminary passphrase access show expire audit edit update delete_file notify_by_email].include?(action_name)
       @push.kind
     elsif action_name == "new"
       case params["tab"]
@@ -524,4 +548,15 @@ def check_allowed
       end
     end
   end
+
+  def notify_by_email_params
+    params.require(:push).permit(:notify_by_email_recipients, :notify_by_email_locale)
+  end
+
+  def assign_notify_by_email_params(push, permitted_params, required: false)
+    push.notify_by_email_recipients = permitted_params[:notify_by_email_recipients]
+    push.notify_by_email_locale = permitted_params[:notify_by_email_locale]
+    push.notify_by_email_creator = current_user if user_signed_in?
+    push.notify_by_email_required = required
+  end
 end

app/helpers/pushes_helper.rb

@@ -7,6 +7,12 @@ def push_payload_auto_reblur_seconds
     PUSH_PAYLOAD_AUTO_REBLUR_SECONDS
   end
 
+  # Returns a human-readable string for push expiration (days only), e.g. "5 days" or "1 day".
+  def format_days_remaining(push)
+    days = push.days_remaining
+    "#{days} #{n_("day", "days", days)}"
+  end
+
   def filesize(size)
     units = %w[B KiB MiB GiB TiB Pib EiB ZiB]
 

app/javascript/controllers/select_dropdown_controller.js

@@ -0,0 +1,28 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = [ "menuButtonInner", "field" ]
+
+  connect() {
+    this.restoreSelectedValue();
+  }
+
+  select(event) {
+    this.fieldTarget.value = event.currentTarget.dataset.lang;
+    const template = event.currentTarget.querySelector('template');
+    this.menuButtonInnerTarget.replaceChildren(template.content.cloneNode(true));
+  }
+
+  restoreSelectedValue() {
+    const selectedLang = this.fieldTarget.value;
+    if (selectedLang) {
+      const selectedOption = this.element.querySelector(`[data-lang="${selectedLang}"]`);
+      if (selectedOption) {
+        const template = selectedOption.querySelector('template');
+        if (template) {
+          this.menuButtonInnerTarget.replaceChildren(template.content.cloneNode(true));
+        }
+      }
+    }
+  }
+}