Skip to content

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

FIX: Preserve query parameters in OTP callback URLs (#44115)

Gabriel Grubba6eeead816992
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rb
index f94b538a40d..c05fc16e852 100644
--- a/app/controllers/user_api_keys_controller.rb
+++ b/app/controllers/user_api_keys_controller.rb
@@ -425,7 +425,9 @@ class UserApiKeysController < ApplicationController
raise Discourse::InvalidAccess unless meets_tl?
otp_payload = one_time_password(parsed_public_key, current_user.username)
- redirect_path = "#{params[:auth_redirect]}?oneTimePassword=#{CGI.escape(otp_payload)}"
+ uri = URI.parse(params[:auth_redirect])
+ uri.query = [uri.query, "oneTimePassword=#{CGI.escape(otp_payload)}"].compact.join("&")
+ redirect_path = uri.to_s
respond_to do |format|
format.html { redirect_to(redirect_path, allow_other_host: true) }
diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rb
index 68eba03f16f..861eb5d8534 100644
--- a/spec/requests/user_api_keys_controller_spec.rb
+++ b/spec/requests/user_api_keys_controller_spec.rb
@@ -1101,6 +1101,23 @@ RSpec.describe UserApiKeysController do
expect(Discourse.redis.get("otp_#{otp}")).to eq(user.username)
end
+ it "preserves callback query parameters when returning an OTP" do
+ auth_redirect = "#{otp_args[:auth_redirect]}?state=return-to-client"
+ SiteSetting.allowed_user_api_auth_redirects = auth_redirect
+ user = Fabricate(:user, refresh_auto_groups: true)
+ sign_in(user)
+
+ post "/user-api-key/otp.json", params: otp_args.merge(auth_redirect: auth_redirect)
+
+ expect(response.status).to eq(200)
+ redirect_uri = URI.parse(response.parsed_body["redirect_url"])
+ query = Rack::Utils.parse_query(redirect_uri.query)
+ expect(query).to include("state" => "return-to-client", "oneTimePassword" => be_present)
+
+ otp = decrypt_payload(Base64.decode64(query["oneTimePassword"]))
+ expect(Discourse.redis.get("otp_#{otp}")).to eq(user.username)
+ end
+
it "encrypts OTP with OAEP padding when requested" do
SiteSetting.allowed_user_api_auth_redirects = otp_args[:auth_redirect]
user = Fabricate(:user, refresh_auto_groups: true)