Skip to content

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

DEV: Fix invite-only OAuth signup bypass via non-invite origin routes (#38646)

Isaac Janzend39bd03d11f2
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index f8626e58d39..528d412b1f5 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -158,8 +158,8 @@ class Users::OmniauthCallbacksController < ApplicationController
if SiteSetting.invite_only?
path = Discourse.route_for(@origin)
return true unless path
- return true if path[:controller] != "invites" && path[:action] != "show"
- !Invite.exists?(invite_key: path[:id])
+ return true if path[:controller] != "invites" || path[:action] != "show"
+ !Invite.find_by(invite_key: path[:id])&.redeemable?
end
end
diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb
index c4d9023b60b..8287aca0e2d 100644
--- a/spec/requests/omniauth_callbacks_controller_spec.rb
+++ b/spec/requests/omniauth_callbacks_controller_spec.rb
@@ -455,6 +455,33 @@ RSpec.describe Users::OmniauthCallbacksController do
expect(data["requires_invite"]).to eq(nil)
end
+
+ it "requires invite when origin is a non-invite route containing an invite key" do
+ invite = Fabricate(:invite)
+ Rails.application.env_config["omniauth.origin"] = "/t/#{invite.invite_key}"
+
+ get "/auth/google_oauth2/callback.json"
+
+ expect(response.status).to eq(302)
+ data = JSON.parse(response.cookies["authentication_data"])
+ expect(data["requires_invite"]).to eq(true)
+ end
+
+ it "requires invite when the invite is not redeemable" do
+ invite = Fabricate(:invite, expires_at: 1.day.ago)
+ origin =
+ Rails.application.routes.url_helpers.invite_url(
+ invite.invite_key,
+ host: Discourse.base_url,
+ )
+ Rails.application.env_config["omniauth.origin"] = origin
+
+ get "/auth/google_oauth2/callback.json"
+
+ expect(response.status).to eq(302)
+ data = JSON.parse(response.cookies["authentication_data"])
+ expect(data["requires_invite"]).to eq(true)
+ end
end
end