A platform for community discussion. Free, open, simple.
FIX: Validate auth_redirect against registered client in delegated auth (#38400)
Natalie Tay44338ac69c38
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rbindex 7d0ee9d719c..66e9c992b49 100644--- a/app/controllers/application_controller.rb+++ b/app/controllers/application_controller.rb@@ -802,6 +802,11 @@ class ApplicationController < ActionController::Basereturn render plain: I18n.t("user_api_key.invalid_public_key")end+ client = UserApiKeyClient.find_by(public_key: params[:user_api_public_key])+ if client&.auth_redirect.present? && params[:auth_redirect] != client.auth_redirect+ return render plain: I18n.t("user_api_key.invalid_auth_redirect")+ end+if UserApiKeyClient.invalid_auth_redirect?(params[:auth_redirect])return render plain: I18n.t("user_api_key.invalid_auth_redirect")enddiff --git a/spec/requests/application_controller_spec.rb b/spec/requests/application_controller_spec.rbindex cff2a6b2a62..70304dbc66a 100644--- a/spec/requests/application_controller_spec.rb+++ b/spec/requests/application_controller_spec.rb@@ -908,6 +908,55 @@ RSpec.describe ApplicationController doexpect(response.status).to eq(302)expect(response).to redirect_to("#{args[:auth_redirect]}?otp=true")end++ it "does not allow auth_redirect that differs from a registered client's redirect" do+ SiteSetting.allowed_user_api_auth_redirects = "https://*.example.com/callback"++ Fabricate(+ :user_api_key_client,+ public_key: public_key,+ auth_redirect: "https://legitimate.example.com/callback",+ )++ args[:user_api_public_key] = public_key+ args[:auth_redirect] = "https://evil.example.com/callback"++ get "/latest", params: args++ expect(response.body).to eq(I18n.t("user_api_key.invalid_auth_redirect"))+ end++ it "redirects when auth_redirect matches a registered client's redirect and global allowlist" do+ SiteSetting.allowed_user_api_auth_redirects = "https://legitimate.example.com/callback"++ Fabricate(+ :user_api_key_client,+ public_key: public_key,+ auth_redirect: "https://legitimate.example.com/callback",+ )++ args[:user_api_public_key] = public_key+ args[:auth_redirect] = "https://legitimate.example.com/callback"++ get "/latest", params: args++ expect(response.status).to eq(302)+ expect(response).to redirect_to("#{args[:auth_redirect]}?otp=true")+ end++ it "falls back to global wildcards when client has no registered auth_redirect" do+ SiteSetting.allowed_user_api_auth_redirects = "discourse://auth_redirect"++ Fabricate(:user_api_key_client, public_key: public_key, auth_redirect: nil)++ args[:user_api_public_key] = public_key+ args[:auth_redirect] = "discourse://auth_redirect"++ get "/latest", params: args++ expect(response.status).to eq(302)+ expect(response).to redirect_to("#{args[:auth_redirect]}?otp=true")+ endenddescribe "Content Security Policy" do