A platform for community discussion. Free, open, simple.
FEATURE: Allow HTML for OAuth error message (#41204)
Mark VanLandingham8bd4acb89eb2
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rbindex dd96ee1957a..e3c0e16e5dc 100644--- a/app/controllers/users/omniauth_callbacks_controller.rb+++ b/app/controllers/users/omniauth_callbacks_controller.rb@@ -140,7 +140,7 @@ class Users::OmniauthCallbacksController < ApplicationControllerprotecteddef render_auth_result_failure- flash[:error] = @auth_result.failed_reason+ flash[:error] = PrettyText.sanitize(@auth_result.failed_reason).html_saferender "failure"enddiff --git a/lib/pretty_text.rb b/lib/pretty_text.rbindex 3e7a79f425d..b5075f0a112 100644--- a/lib/pretty_text.rb+++ b/lib/pretty_text.rb@@ -291,6 +291,16 @@ module PrettyTextJSend+ def self.sanitize(html, opts = {})+ protect { v8.eval(<<~JS) }+ (() => {+ const AllowLister = require("pretty-text/allow-lister").default;+ const sanitize = require("pretty-text/sanitizer").sanitize;+ return sanitize(#{html.to_s.inspect}, new AllowLister(#{opts.to_json}));+ })()+ JS+ end+def self.unescape_emoji(title)return title unless SiteSetting.enable_emoji? && titlediff --git a/spec/lib/pretty_text_spec.rb b/spec/lib/pretty_text_spec.rbindex 38bb0836223..8e679a84881 100644--- a/spec/lib/pretty_text_spec.rb+++ b/spec/lib/pretty_text_spec.rb@@ -2498,6 +2498,17 @@ HTMLexpect(PrettyText.cook("<test>alert(42)</test>")).to eq "<p>alert(42)</p>"end+ it "sanitizes html without cooking markdown" do+ sanitized =+ PrettyText.sanitize(+ '<a href="https://example.com" target="_blank" rel="noopener" onclick="alert(1)">learn more</a><a href="javascript:alert(1)">bad</a><script>alert(1)</script>',+ )++ expect(sanitized).to eq(+ '<a href="https://example.com" target="_blank">learn more</a><a>bad</a>',+ )+ end+it "should not onebox magically linked urls" doexpect(PrettyText.cook("[url]site.com[/url]")).not_to include("onebox")enddiff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rbindex 8aa26bcc7fd..9c06281d8a2 100644--- a/spec/requests/omniauth_callbacks_controller_spec.rb+++ b/spec/requests/omniauth_callbacks_controller_spec.rb@@ -725,6 +725,38 @@ RSpec.describe Users::OmniauthCallbacksController doexpect(user.email).to eq("[email protected]")end+ it "sanitizes custom failed auth result HTML" do+ link_html =+ '<a href="https://example.com/help" target="_blank" rel="noopener" onclick="alert(1)">Learn more</a>'+ failed_result = Auth::Result.new+ failed_result.failed = true+ failed_result.failed_reason = [+ "Partner accounts only.",+ link_html,+ "<script>alert(1)</script>",+ ].join("\n")++ Auth::GoogleOAuth2Authenticator+ .any_instance+ .stubs(:after_authenticate)+ .returns(failed_result)++ get "/auth/google_oauth2/callback"++ document = Nokogiri.HTML5(response.body)+ alert = document.at_css(".alert-error")+ link = alert.at_css("a")++ aggregate_failures do+ expect(response.status).to eq(200)+ expect(alert.text).to include("Partner accounts only.")+ expect(link["href"]).to eq("https://example.com/help")+ expect(link["target"]).to eq("_blank")+ expect(link["onclick"]).to be_nil+ expect(alert.to_html).not_to include("<script")+ end+ end+context "when user has TOTP enabled" dobefore { user.create_totp(enabled: true) }