github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

hard match domains for automatic group membership

Browse Source
This commit is contained in:
Régis Hanol 2015-01-26 23:17:29 +01:00
parent 088260f053
commit efd65dcc8c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/automatic_group_membership.rb
View File

@ -13,7 +13,7 @@ module Jobs
domains = group.automatic_membership_email_domains.gsub('.', '\.') domains = group.automatic_membership_email_domains.gsub('.', '\.')
User.where("email ~* '@(#{domains})'").find_each do |user| User.where("email ~* '@(#{domains})$'").find_each do |user|
group.add(user) rescue ActiveRecord::RecordNotUnique group.add(user) rescue ActiveRecord::RecordNotUnique
end end
end end

2
app/models/user.rb
View File

@ -721,7 +721,7 @@ class User < ActiveRecord::Base
.where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0") .where("LENGTH(COALESCE(automatic_membership_email_domains, '')) > 0")
.each do |group| .each do |group|
domains = group.automatic_membership_email_domains.gsub('.', '\.') domains = group.automatic_membership_email_domains.gsub('.', '\.')
if self.email =~ Regexp.new("@(#{domains})", true) if self.email =~ Regexp.new("@(#{domains})$", true)
group.add(self) rescue ActiveRecord::RecordNotUnique group.add(self) rescue ActiveRecord::RecordNotUnique
end end
end end