A platform for community discussion. Free, open, simple.
SECURITY: Validate auth_redirect in UserApiKeysController#new to prevent open redirect phishing
David Taylor757753af1b4a
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rbindex 002d53e98ff..3e1496aa615 100644--- a/app/controllers/user_api_keys_controller.rb+++ b/app/controllers/user_api_keys_controller.rb@@ -22,6 +22,7 @@ class UserApiKeysController < ApplicationControllerfind_clientrequire_client_paramsvalidate_params+ validate_auth_redirectunless current_usercookies[:destination_url] = request.fullpathdiff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rbindex d6bdb4cc6a8..628d4726d8d 100644--- a/spec/requests/user_api_keys_controller_spec.rb+++ b/spec/requests/user_api_keys_controller_spec.rb@@ -43,7 +43,10 @@ RSpec.describe UserApiKeysController dodescribe "as a normal user" dofab!(:user) { Fabricate(:user, refresh_auto_groups: true) }- before { sign_in(user) }+ before do+ sign_in(user)+ SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]+ endit "includes padding parameter in the form only when provided" doget "/user-api-key/new", params: args@@ -59,6 +62,8 @@ RSpec.describe UserApiKeysController doendit "does not show redirect warning when auth_redirect is discourse://auth_redirect" do+ SiteSetting.allowed_user_api_auth_redirects = "discourse://auth_redirect"+get "/user-api-key/new", params: args.merge(auth_redirect: "discourse://auth_redirect")expect(response.body).not_to include(I18n.t("user_api_key.redirect_warning"))end@@ -75,6 +80,21 @@ RSpec.describe UserApiKeysController doexpect(response.body).to include("<strong>callback</strong>")expect(response.body).not_to include("<strong>callback:</strong>")end++ it "rejects auth_redirect to a disallowed domain" do+ get "/user-api-key/new", params: args.merge(auth_redirect: "https://evil.com/steal")+ expect(response.body).to include(I18n.t("user_api_key.generic_error"))+ expect(response.body).not_to include("evil.com")+ end++ it "allows auth_redirect when it matches allowed_user_api_auth_redirects" do+ SiteSetting.allowed_user_api_auth_redirects = "https://good.com/callback"++ get "/user-api-key/new", params: args.merge(auth_redirect: "https://good.com/callback")+ expect(response.status).to eq(200)+ expect(response.body).to include("good.com")+ expect(response.body).not_to include(I18n.t("user_api_key.generic_error"))+ endendend