From 1c4bf3e1e0c5e33d8540233d3069b9f68a06efdc Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge.manrubia@gmail.com>
Date: Thu, 19 Mar 2026 15:36:36 +0100
Subject: [PATCH] Add per-account storage exceptions for SaaS (#2733)

Allow granting specific accounts more storage via an
account_storage_exceptions table in the saas DB, without
relying on the blanket staff bypass.
---
 saas/app/models/account/storage_exception.rb  |  5 ++
 saas/app/models/account/storage_limited.rb    | 22 +++++++--
 .../saas/_storage_limit_exceeded.html.erb     |  2 +-
 .../saas/_storage_limit_exceeded.html.erb     |  2 +-
 .../saas/_storage_limit_notice.html.erb       |  2 +-
 ...42914_create_account_storage_exceptions.rb | 10 ++++
 saas/db/saas_schema.rb                        | 10 +++-
 .../models/account/storage_exception_test.rb  | 46 +++++++++++++++++++
 8 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 saas/app/models/account/storage_exception.rb
 create mode 100644 saas/db/migrate/20260319142914_create_account_storage_exceptions.rb
 create mode 100644 saas/test/models/account/storage_exception_test.rb

diff --git a/saas/app/models/account/storage_exception.rb b/saas/app/models/account/storage_exception.rb
new file mode 100644
index 000000000..4c2db8955
--- /dev/null
+++ b/saas/app/models/account/storage_exception.rb
@@ -0,0 +1,5 @@
+class Account::StorageException < SaasRecord
+  belongs_to :account
+
+  validates :bytes_allowed, presence: true, numericality: { greater_than: 0 }
+end
diff --git a/saas/app/models/account/storage_limited.rb b/saas/app/models/account/storage_limited.rb
index dbab32b5d..46db55297 100644
--- a/saas/app/models/account/storage_limited.rb
+++ b/saas/app/models/account/storage_limited.rb
@@ -1,14 +1,30 @@
 module Account::StorageLimited
   extend ActiveSupport::Concern
 
-  STORAGE_LIMIT = 1.gigabyte
+  DEFAULT_STORAGE_LIMIT = 1.gigabyte
   NEAR_STORAGE_LIMIT_THRESHOLD = 500.megabytes
 
+  included do
+    has_one :storage_exception
+  end
+
+  def storage_limit
+    storage_exception&.bytes_allowed || DEFAULT_STORAGE_LIMIT
+  end
+
   def exceeding_storage_limit?
-    bytes_used > STORAGE_LIMIT
+    bytes_used > storage_limit
   end
 
   def nearing_storage_limit?
-    !exceeding_storage_limit? && bytes_used > STORAGE_LIMIT - NEAR_STORAGE_LIMIT_THRESHOLD
+    !exceeding_storage_limit? && bytes_used > storage_limit - NEAR_STORAGE_LIMIT_THRESHOLD
+  end
+
+  def add_storage_exception(bytes)
+    if storage_exception
+      storage_exception.update!(bytes_allowed: bytes)
+    else
+      create_storage_exception!(bytes_allowed: bytes)
+    end
   end
 end
diff --git a/saas/app/views/cards/comments/saas/_storage_limit_exceeded.html.erb b/saas/app/views/cards/comments/saas/_storage_limit_exceeded.html.erb
index 82ab7f25e..f5f68bda0 100644
--- a/saas/app/views/cards/comments/saas/_storage_limit_exceeded.html.erb
+++ b/saas/app/views/cards/comments/saas/_storage_limit_exceeded.html.erb
@@ -3,7 +3,7 @@
     <div class="comment__content flex flex-column flex-item-grow full-width">
       <div class="comment__body lexxy-content">
         <div class="action-text-content">
-          <strong>This account has used all the included free storage (<%= number_to_human_size(Account::StorageLimited::STORAGE_LIMIT) %>).</strong>
+          <strong>This account has used all the included free storage (<%= number_to_human_size(Current.account.storage_limit) %>).</strong>
           <div><%= link_to "Self-host Fizzy", "https://github.com/basecamp/fizzy", target: "_blank" %> for unlimited storage.</div>
         </div>
       </div>
diff --git a/saas/app/views/cards/container/footer/saas/_storage_limit_exceeded.html.erb b/saas/app/views/cards/container/footer/saas/_storage_limit_exceeded.html.erb
index ca0dc9be0..047b3b2c8 100644
--- a/saas/app/views/cards/container/footer/saas/_storage_limit_exceeded.html.erb
+++ b/saas/app/views/cards/container/footer/saas/_storage_limit_exceeded.html.erb
@@ -1,6 +1,6 @@
 <div class="card-perma__notch card-perma__notch--bottom">
   <div class="card-perma__account-limit-message">
-    <strong>This account has used all the included free storage (<%= number_to_human_size(Account::StorageLimited::STORAGE_LIMIT) %>).</strong>
+    <strong>This account has used all the included free storage (<%= number_to_human_size(Current.account.storage_limit) %>).</strong>
     <div>
       <%= link_to "Self-host Fizzy", "https://github.com/basecamp/fizzy", target: "_blank" %> for unlimited storage.
     </div>
diff --git a/saas/app/views/cards/container/footer/saas/_storage_limit_notice.html.erb b/saas/app/views/cards/container/footer/saas/_storage_limit_notice.html.erb
index a45d2ef74..f6f84e17a 100644
--- a/saas/app/views/cards/container/footer/saas/_storage_limit_notice.html.erb
+++ b/saas/app/views/cards/container/footer/saas/_storage_limit_notice.html.erb
@@ -1,6 +1,6 @@
 <% if Current.account.nearing_storage_limit? && !Current.identity.staff? %>
   <div class="txt-small">
-    This account has used <strong><%= number_to_human_size(Current.account.bytes_used) %></strong> of <strong><%= number_to_human_size(Account::StorageLimited::STORAGE_LIMIT) %></strong> storage.
+    This account has used <strong><%= number_to_human_size(Current.account.bytes_used) %></strong> of <strong><%= number_to_human_size(Current.account.storage_limit) %></strong> storage.
     <div><%= link_to "Self-host Fizzy", "https://github.com/basecamp/fizzy", class: "txt-current txt-underline", target: "_blank" %> for unlimited storage.</div>
   </div>
 <% end %>
diff --git a/saas/db/migrate/20260319142914_create_account_storage_exceptions.rb b/saas/db/migrate/20260319142914_create_account_storage_exceptions.rb
new file mode 100644
index 000000000..a68db0e0c
--- /dev/null
+++ b/saas/db/migrate/20260319142914_create_account_storage_exceptions.rb
@@ -0,0 +1,10 @@
+class CreateAccountStorageExceptions < ActiveRecord::Migration[8.2]
+  def change
+    create_table :account_storage_exceptions, id: :uuid do |t|
+      t.references :account, null: false, type: :uuid, index: { unique: true }
+      t.bigint :bytes_allowed, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/saas/db/saas_schema.rb b/saas/db/saas_schema.rb
index 5ae786764..1b6264f05 100644
--- a/saas/db/saas_schema.rb
+++ b/saas/db/saas_schema.rb
@@ -10,7 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.2].define(version: 2026_03_17_000000) do
+ActiveRecord::Schema[8.2].define(version: 2026_03_19_142914) do
+  create_table "account_storage_exceptions", id: :uuid, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.uuid "account_id", null: false
+    t.bigint "bytes_allowed", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_account_storage_exceptions_on_account_id", unique: true
+  end
+
   create_table "action_push_native_devices", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.string "name"
diff --git a/saas/test/models/account/storage_exception_test.rb b/saas/test/models/account/storage_exception_test.rb
new file mode 100644
index 000000000..f904f04a3
--- /dev/null
+++ b/saas/test/models/account/storage_exception_test.rb
@@ -0,0 +1,46 @@
+require "test_helper"
+
+class Account::StorageExceptionTest < ActiveSupport::TestCase
+  test "storage limit returns default when no exception exists" do
+    assert_equal Account::StorageLimited::DEFAULT_STORAGE_LIMIT, accounts(:initech).storage_limit
+  end
+
+  test "storage limit returns exception value when one exists" do
+    account = accounts(:initech)
+    account.add_storage_exception(5.gigabytes)
+
+    assert_equal 5.gigabytes, account.storage_limit
+  end
+
+  test "add storage exception creates a new record" do
+    account = accounts(:initech)
+
+    assert_difference -> { Account::StorageException.count } do
+      account.add_storage_exception(2.gigabytes)
+    end
+
+    assert_equal 2.gigabytes, account.storage_exception.bytes_allowed
+  end
+
+  test "add storage exception updates existing record" do
+    account = accounts(:initech)
+    account.add_storage_exception(2.gigabytes)
+
+    assert_no_difference -> { Account::StorageException.count } do
+      account.add_storage_exception(10.gigabytes)
+    end
+
+    assert_equal 10.gigabytes, account.storage_exception.reload.bytes_allowed
+  end
+
+  test "exceeding storage limit respects exception" do
+    account = accounts(:initech)
+    Account.any_instance.stubs(:bytes_used).returns(2.gigabytes)
+
+    assert account.exceeding_storage_limit?
+
+    account.add_storage_exception(5.gigabytes)
+
+    assert_not account.exceeding_storage_limit?
+  end
+end