IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: more cases of case sensitive group membership in sso

Browse Source
This commit is contained in:
Neil Lalonde
2017-08-11 18:09:22 -04:00
parent c2016e2bc6
commit 9813f9f0f8
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/discourse_single_sign_on.rb
View File

@@ -110,7 +110,7 @@ class DiscourseSingleSignOn < SingleSignOn
if add_groups
split = add_groups.split(",").map(&:downcase)
if split.length > 0
Group.where('name in (?) AND NOT automatic', split).pluck(:id).each do |id|
Group.where('LOWER(name) in (?) AND NOT automatic', split).pluck(:id).each do |id|
unless GroupUser.where(group_id: id, user_id: user.id).exists?
GroupUser.create(group_id: id, user_id: user.id)
end
@@ -119,11 +119,11 @@ class DiscourseSingleSignOn < SingleSignOn
end
if remove_groups
split = remove_groups.split(",")
split = remove_groups.split(",").map(&:downcase)
if split.length > 0
GroupUser
.where(user_id: user.id)
.where('group_id IN (SELECT id FROM groups WHERE name in (?))', split)
.where('group_id IN (SELECT id FROM groups WHERE LOWER(name) in (?))', split)
.destroy_all
end
end