A platform for community discussion. Free, open, simple.
FIX: Ensure email_verified is properly checked for true values in OAuth2 Basic (#42319)
Mark VanLandingham550b71727989
diff --git a/plugins/discourse-oauth2-basic/lib/oauth2_basic_authenticator.rb b/plugins/discourse-oauth2-basic/lib/oauth2_basic_authenticator.rbindex b48a4e6196f..1f0b65b4aee 100644--- a/plugins/discourse-oauth2-basic/lib/oauth2_basic_authenticator.rb+++ b/plugins/discourse-oauth2-basic/lib/oauth2_basic_authenticator.rb@@ -255,10 +255,9 @@ class OAuth2BasicAuthenticator < Auth::ManagedAuthenticatordef primary_email_verified?(auth)return true if SiteSetting.oauth2_email_verified- verified = auth["info"]["email_verified"]- verified = true if verified == "true"- verified = false if verified == "false"- verified++ email_verified = auth["info"]["email_verified"]+ email_verified == true || (email_verified.is_a?(String) && email_verified.downcase == "true")enddef always_update_user_email?diff --git a/plugins/discourse-oauth2-basic/spec/integration/overrides_email_spec.rb b/plugins/discourse-oauth2-basic/spec/integration/overrides_email_spec.rbindex af5a25ad74b..689c9bf6cb4 100644--- a/plugins/discourse-oauth2-basic/spec/integration/overrides_email_spec.rb+++ b/plugins/discourse-oauth2-basic/spec/integration/overrides_email_spec.rb@@ -36,6 +36,30 @@ describe "OAuth2 Overrides Email", type: :request doexpect(user.reload.email).to eq(initial_email)end+ it "doesn't link an unverified provider account to a matching email" do+ SiteSetting.oauth2_email_verified = false+ OmniAuth.config.mock_auth[:oauth2_basic] = OmniAuth::AuthHash.new(+ provider: "oauth2_basic",+ uid: "unverified-provider-uid",+ info: OmniAuth::AuthHash::InfoHash.new(email: user.email, email_verified: "pending"),+ extra: OmniAuth::AuthHash.new,+ credentials: OmniAuth::AuthHash.new,+ )++ get "/auth/oauth2_basic/callback"++ expect(response.status).to eq(302)+ expect(response.body).to be_blank+ expect(session[:current_user_id]).to be_nil+ expect(+ UserAssociatedAccount.exists?(+ provider_name: "oauth2_basic",+ provider_uid: "unverified-provider-uid",+ user: user,+ ),+ ).to eq(false)+ end+it "updates user email if enabled" doSiteSetting.oauth2_overrides_email = truediff --git a/plugins/discourse-oauth2-basic/spec/plugin_spec.rb b/plugins/discourse-oauth2-basic/spec/plugin_spec.rbindex 290e48f96e6..7ac0f9f768a 100644--- a/plugins/discourse-oauth2-basic/spec/plugin_spec.rb+++ b/plugins/discourse-oauth2-basic/spec/plugin_spec.rb@@ -62,6 +62,22 @@ describe OAuth2BasicAuthenticator doexpect(result.email_valid).to eq(false)end+ it "only accepts explicit verified email values" do+ SiteSetting.oauth2_email_verified = false++ [true, "true", "True", "TRUE"].each do |email_verified|+ expect(+ authenticator.primary_email_verified?(auth.deep_merge(info: { email_verified: })),+ ).to eq(true)+ end++ [false, nil, "false", "pending", 0, [], {}].each do |email_verified|+ expect(+ authenticator.primary_email_verified?(auth.deep_merge(info: { email_verified: })),+ ).to eq(false)+ end+ end+describe "fetch_user_details" dobefore(:each) doSiteSetting.oauth2_fetch_user_details = true