From 42bc6caee038d0abcb8636182c2c0eac70dae8e8 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Sun, 17 Sep 2017 18:07:29 -0700 Subject: Trim extraneous spaces from DNs --- lib/gitlab/ldap/auth_hash.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index 4fbc5fa5262..3123da17fd9 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -3,6 +3,10 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash + def uid + Gitlab::LDAP::Person.normalize_dn(super) + end + private def get_info(key) -- cgit v1.2.1 From abe570cd0b00a6696a0bfa1c4223d9bbbff9b58f Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Sun, 17 Sep 2017 21:28:54 -0700 Subject: Refactor to distinguish between UIDs and DNs --- lib/gitlab/ldap/auth_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index 3123da17fd9..da75649d6d5 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -4,7 +4,7 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash def uid - Gitlab::LDAP::Person.normalize_dn(super) + Gitlab::LDAP::Person.normalize_uid_or_dn(super) end private -- cgit v1.2.1 From aefc96ca27287cc5d23653606c2cc27114b8fa09 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Tue, 19 Sep 2017 10:38:18 -0700 Subject: Rely on LDAP providers giving DNs, not UIDs --- lib/gitlab/ldap/auth_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index da75649d6d5..3123da17fd9 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -4,7 +4,7 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash def uid - Gitlab::LDAP::Person.normalize_uid_or_dn(super) + Gitlab::LDAP::Person.normalize_dn(super) end private -- cgit v1.2.1 From 45ab20dca91024602e7c73814e8ff89df2000189 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Wed, 20 Sep 2017 17:28:57 -0700 Subject: Switch to new DN class for normalizing and parsing DNs --- lib/gitlab/ldap/auth_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index 3123da17fd9..2ea0a51b18f 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -4,7 +4,7 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash def uid - Gitlab::LDAP::Person.normalize_dn(super) + Gitlab::LDAP::DN.new(super).to_s_normalized end private -- cgit v1.2.1 From 714f264d62c5d2a45efc4b013f2fca1eb7eff1f1 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Mon, 2 Oct 2017 15:00:50 -0700 Subject: Rename method to `to_normalized_s` --- lib/gitlab/ldap/auth_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index 2ea0a51b18f..b173b879f5f 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -4,7 +4,7 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash def uid - Gitlab::LDAP::DN.new(super).to_s_normalized + Gitlab::LDAP::DN.new(super).to_normalized_s end private -- cgit v1.2.1 From 8c29a04549d4a956508ef9a92a043a309978fa34 Mon Sep 17 00:00:00 2001 From: Michael Kozono Date: Thu, 5 Oct 2017 03:47:48 -0700 Subject: Leave bad DNs alone instead of raising errors --- lib/gitlab/ldap/auth_hash.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gitlab/ldap/auth_hash.rb') diff --git a/lib/gitlab/ldap/auth_hash.rb b/lib/gitlab/ldap/auth_hash.rb index b173b879f5f..3123da17fd9 100644 --- a/lib/gitlab/ldap/auth_hash.rb +++ b/lib/gitlab/ldap/auth_hash.rb @@ -4,7 +4,7 @@ module Gitlab module LDAP class AuthHash < Gitlab::OAuth::AuthHash def uid - Gitlab::LDAP::DN.new(super).to_normalized_s + Gitlab::LDAP::Person.normalize_dn(super) end private -- cgit v1.2.1