Skip to content

A platform for community discussion. Free, open, simple.

FIX: Validate return_url on logout (#38621)

Natalie Tay7bfb73f218e5
diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb
index 6aadd8ea935..13769ebcb36 100644
--- a/app/controllers/session_controller.rb
+++ b/app/controllers/session_controller.rb
@@ -56,9 +56,8 @@ class SessionController < ApplicationController
if result.second_factor_auth_skipped?
data = result.data
if data[:logout]
- params[:return_url] = data[:return_sso_url]
PushNotificationPusher.clear_subscriptions(current_user) if current_user
- destroy
+ destroy(trusted_return_url: data[:return_sso_url])
return
end
@@ -677,8 +676,18 @@ class SessionController < ApplicationController
end
end
- def destroy
- redirect_url = params[:return_url].presence || SiteSetting.logout_redirect.presence
+ def destroy(trusted_return_url: nil)
+ return_url = params[:return_url].presence
+ if return_url
+ begin
+ uri = URI(return_url)
+ return_url = nil if uri.host.present? || uri.scheme.present? || !uri.path&.start_with?("/")
+ rescue URI::Error, ArgumentError
+ return_url = nil
+ end
+ end
+
+ redirect_url = trusted_return_url || return_url || SiteSetting.logout_redirect.presence
redirect_url ||=
if SiteSetting.login_required
diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb
index e3a97302b23..13ebad157e5 100644
--- a/spec/requests/session_controller_spec.rb
+++ b/spec/requests/session_controller_spec.rb
@@ -2618,6 +2618,82 @@ RSpec.describe SessionController do
ensure
DiscourseEvent.off(:before_session_destroy, &callback)
end
+
+ context "with return_url parameter" do
+ it "rejects absolute external URLs" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json",
+ params: {
+ return_url: "https://evil.com/phishing",
+ },
+ xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/")
+ end
+
+ it "rejects protocol-relative URLs" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json",
+ params: {
+ return_url: "//evil.com/phishing",
+ },
+ xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/")
+ end
+
+ it "rejects backslash variants that browsers may normalize to protocol-relative" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json", params: { return_url: "/\\evil.com" }, xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/")
+ end
+
+ it "rejects javascript: scheme URLs" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json",
+ params: {
+ return_url: "javascript:alert(1)",
+ },
+ xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/")
+ end
+
+ it "rejects external URLs for non-XHR requests" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json", params: { return_url: "https://evil.com/phishing" }
+
+ expect(response.status).to eq(302)
+ expect(response.location).to eq("http://test.localhost/")
+ end
+
+ it "allows valid relative paths" do
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json",
+ params: {
+ return_url: "/t/some-topic/123",
+ },
+ xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/t/some-topic/123")
+ end
+
+ it "allows bare root path and takes precedence over logout_redirect" do
+ SiteSetting.logout_redirect = "/login"
+
+ user = sign_in(Fabricate(:user))
+ delete "/session/#{user.username}.json", params: { return_url: "/" }, xhr: true
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["redirect_url"]).to eq("/")
+ end
+ end
end
describe "#one_time_password" do