mirror of
https://github.com/discourse/discourse.git
synced 2024-12-15 21:43:49 +08:00
fa8cd629f1
This commit adds token_hash and scopes columns to email_tokens table. token_hash is a replacement for the token column to avoid storing email tokens in plaintext as it can pose a security risk. The new scope column ensures that email tokens cannot be used to perform a different action than the one intended. To sum up, this commit: * Adds token_hash and scope to email_tokens * Reuses code that schedules critical_user_email * Refactors EmailToken.confirm and EmailToken.atomic_confirm methods * Periodically cleans old, unconfirmed or expired email tokens
53 lines
1.8 KiB
Ruby
53 lines
1.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe Jobs::AutomaticGroupMembership do
|
|
|
|
it "raises an error when the group id is missing" do
|
|
expect { Jobs::AutomaticGroupMembership.new.execute({}) }.to raise_error(Discourse::InvalidParameters)
|
|
end
|
|
|
|
it "updates the membership" do
|
|
user1 = Fabricate(:user, email: "no@bar.com")
|
|
user2 = Fabricate(:user, email: "no@wat.com")
|
|
user3 = Fabricate(:user, email: "noo@wat.com", staged: true)
|
|
EmailToken.confirm(Fabricate(:email_token, user: user3).token)
|
|
user4 = Fabricate(:user, email: "yes@wat.com")
|
|
EmailToken.confirm(Fabricate(:email_token, user: user4).token)
|
|
user5 = Fabricate(:user, email: "sso@wat.com")
|
|
user5.create_single_sign_on_record(external_id: 123, external_email: "hacker@wat.com", last_payload: "")
|
|
user6 = Fabricate(:user, email: "sso2@wat.com")
|
|
user6.create_single_sign_on_record(external_id: 456, external_email: "sso2@wat.com", last_payload: "")
|
|
|
|
group = Fabricate(:group, automatic_membership_email_domains: "wat.com")
|
|
|
|
automatic = nil
|
|
called = false
|
|
|
|
blk = Proc.new do |_u, _g, options|
|
|
automatic = options[:automatic]
|
|
called = true
|
|
end
|
|
|
|
begin
|
|
DiscourseEvent.on(:user_added_to_group, &blk)
|
|
Jobs::AutomaticGroupMembership.new.execute(group_id: group.id)
|
|
|
|
expect(automatic).to eql(true)
|
|
expect(called).to eq(true)
|
|
ensure
|
|
DiscourseEvent.off(:user_added_to_group, &blk)
|
|
end
|
|
|
|
group.reload
|
|
expect(group.users.include?(user1)).to eq(false)
|
|
expect(group.users.include?(user2)).to eq(false)
|
|
expect(group.users.include?(user3)).to eq(false)
|
|
expect(group.users.include?(user4)).to eq(true)
|
|
expect(group.users.include?(user5)).to eq(false)
|
|
expect(group.users.include?(user6)).to eq(true)
|
|
end
|
|
|
|
end
|