From 5146a8e399518ccff7429b60101e5677d1f4343a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Guitaut?= <loic@discourse.org>
Date: Thu, 2 Oct 2025 09:55:47 +0200
Subject: [PATCH] Revert "DEV: Debug cookie overflows" (#35120)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reverts discourse/discourse#34639

We understood the main culprit for cookie overflows was storing
`destination_url` in the session, so we don’t really need that debug
code anymore.
---
 .../session/discourse_cookie_store.rb         |  3 ---
 .../discourse_cookie_store_spec.rb            | 20 -------------------
 2 files changed, 23 deletions(-)

diff --git a/lib/action_dispatch/session/discourse_cookie_store.rb b/lib/action_dispatch/session/discourse_cookie_store.rb
index 5eeb00391ba..24cf5816081 100644
--- a/lib/action_dispatch/session/discourse_cookie_store.rb
+++ b/lib/action_dispatch/session/discourse_cookie_store.rb
@@ -22,9 +22,6 @@ class ActionDispatch::Session::DiscourseCookieStore < ActionDispatch::Session::C
       end
     end
     cookie_jar(request)[@key] = cookie
-  rescue ActionDispatch::Cookies::CookieOverflow
-    Rails.logger.error("Cookie overflow occurred for #{@key}: #{request.session.to_h.inspect}")
-    raise
   end
 
   def session_has_changed?(request, session)
diff --git a/spec/integration/discourse_cookie_store_spec.rb b/spec/integration/discourse_cookie_store_spec.rb
index 0c92d653218..c27b87a3f57 100644
--- a/spec/integration/discourse_cookie_store_spec.rb
+++ b/spec/integration/discourse_cookie_store_spec.rb
@@ -13,24 +13,4 @@ describe ActionDispatch::Session::DiscourseCookieStore, type: :request do
     expect(response.cookies["_forum_session"]).not_to be_present
     expect(session[:_csrf_token]).to eq(csrf_token)
   end
-
-  describe "Cookie overflow" do
-    context "when cookie size exceeds limit" do
-      let(:fake_logger) { FakeLogger.new }
-
-      before do
-        Rails.logger.broadcast_to(fake_logger)
-        allow_any_instance_of(ActionController::RequestForgeryProtection).to receive(
-          :generate_csrf_token,
-        ).and_return(SecureRandom.urlsafe_base64(4097))
-      end
-
-      after { Rails.logger.stop_broadcasting_to(fake_logger) }
-
-      it "logs an error" do
-        get "/session/csrf.json"
-        expect(fake_logger.errors).to include(/Cookie overflow occurred.*"_csrf_token"=>/)
-      end
-    end
-  end
 end