A platform for community discussion. Free, open, simple.
FIX: rescue OpenSSL::PKey::RSAError in UserApiKeysController (#39889)
Penar Musarajbf46f8764d40
diff --git a/app/controllers/user_api_keys_controller.rb b/app/controllers/user_api_keys_controller.rbindex 3e1496aa615..c8dfe0139bd 100644--- a/app/controllers/user_api_keys_controller.rb+++ b/app/controllers/user_api_keys_controller.rb@@ -245,6 +245,8 @@ class UserApiKeysController < ApplicationControllerdef parsed_public_key@parsed_public_key ||= OpenSSL::PKey::RSA.new(public_key_str)+ rescue OpenSSL::PKey::RSAError+ raise Discourse::InvalidParameters.new(:public_key)enddef meets_tl?diff --git a/spec/requests/user_api_keys_controller_spec.rb b/spec/requests/user_api_keys_controller_spec.rbindex db06b2f5a17..ca2cc333e10 100644--- a/spec/requests/user_api_keys_controller_spec.rb+++ b/spec/requests/user_api_keys_controller_spec.rb@@ -40,6 +40,13 @@ RSpec.describe UserApiKeysController doexpect(response.headers["Auth-Api-Version"]).to eq("4")end+ it "rejects a non-RSA public key with 400 even when not logged in" do+ SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]+ ec_key = OpenSSL::PKey::EC.generate("prime256v1")+ get "/user-api-key/new", params: args.merge(public_key: ec_key.to_pem)+ expect(response.status).to eq(400)+ end+describe "as a normal user" dofab!(:user) { Fabricate(:user, refresh_auto_groups: true) }@@ -61,6 +68,12 @@ RSpec.describe UserApiKeysController doexpect(response.status).to eq(400)end+ it "rejects a non-RSA public key with 400" do+ ec_key = OpenSSL::PKey::EC.generate("prime256v1")+ get "/user-api-key/new", params: args.merge(public_key: ec_key.to_pem)+ expect(response.status).to eq(400)+ end+it "shows write scope warning when write scope is requested" doget "/user-api-key/new", params: args.merge(scopes: "write")expect(response.body).to include(I18n.t("user_api_key.write_scope_warning"))@@ -358,6 +371,13 @@ RSpec.describe UserApiKeysController doget "/user-api-key/otp", params: otp_args.merge(padding: "invalid")expect(response.status).to eq(400)end++ it "rejects a non-RSA public key with 400" do+ SiteSetting.allowed_user_api_auth_redirects = otp_args[:auth_redirect]+ ec_key = OpenSSL::PKey::EC.generate("prime256v1")+ get "/user-api-key/otp", params: otp_args.merge(public_key: ec_key.to_pem)+ expect(response.status).to eq(400)+ endenddescribe "#create_otp" do