Commit Graph

174 Commits

Author SHA1 Message Date
Rémy Coutable 4f09d099e9 Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'
Adds Rubocop rule for line break after guard clause

Closes #18040

See merge request gitlab-org/gitlab-ce!15188
2017-11-20 09:22:14 +00:00
Francisco Javier López c7cf68bd6f Changing OAuth lookup to be case insensitive 2017-11-17 14:24:25 +00:00
Jacopo 181cd299f9 Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
2017-11-16 17:58:29 +01:00
Douwe Maan 8399de0c96 Normalize LDAP DN when looking up identity 2017-10-31 17:13:50 +01:00
Michael Kozono 2df7d03586 Redefine `respond_to?` in light of `method_missing` 2017-10-07 10:28:13 -07:00
Michael Kozono e0a0c6b04e Make internal methods private 2017-10-07 10:28:13 -07:00
Michael Kozono 8c29a04549 Leave bad DNs alone instead of raising errors 2017-10-07 10:28:13 -07:00
Michael Kozono 1d1ad7e0b6 Refactor DN error classes 2017-10-07 10:28:13 -07:00
Michael Kozono 6b9229466d Normalize values, reusing DN normalization code
I first attempted to extract logic from the code that normalizes DNs, but I was unsuccessful. This is a hack but it works.
2017-10-07 10:28:13 -07:00
Michael Kozono 689eea5a43 Fix space stripping
Especially from the last attribute value.
2017-10-07 10:28:13 -07:00
Michael Kozono 714f264d62 Rename method to `to_normalized_s` 2017-10-07 10:28:13 -07:00
Michael Kozono a6a764f73d Refactor initialize method for clarity 2017-10-07 10:28:13 -07:00
Michael Kozono b3d61832c3 Move downcasing to normalize method 2017-10-07 10:28:13 -07:00
Michael Kozono 14ed20d68a Resolve Rubocop offenses
Disabling some for now since this is based on `Net::LDAP::DN`.
2017-10-07 10:28:13 -07:00
Michael Kozono 45ab20dca9 Switch to new DN class
for normalizing and parsing DNs
2017-10-07 10:28:13 -07:00
Michael Kozono 26054114be Fix trailing escaped newline 2017-10-07 10:28:13 -07:00
Michael Kozono 66030b03dd Test malformed DNs 2017-10-07 10:28:13 -07:00
Michael Kozono 8bd59f3aeb Raise UnsupportedDnFormatError on multivalued RDNs 2017-10-07 10:28:13 -07:00
Michael Kozono 7e3eb257ba Fix for null DN 2017-10-07 10:28:13 -07:00
Michael Kozono f610fea777 Handle CR and LF characters 2017-10-07 10:28:13 -07:00
Michael Kozono c79879f33a Fix escaped equal signs 2017-10-07 10:28:12 -07:00
Michael Kozono 3fde6f6806 Fix trailing escaped space 2017-10-07 10:28:12 -07:00
Michael Kozono cb591f86e4 Fix to_s_normalize for escaped leading space 2017-10-07 10:28:12 -07:00
Michael Kozono a0d7a22e7c Always downcase DNs 2017-10-07 10:28:12 -07:00
Michael Kozono 91f2492a78 Add `DN#to_s_normalized` 2017-10-07 10:28:12 -07:00
Michael Kozono 2f11db4b00 Adapt DN class for Gitlab 2017-10-07 10:28:12 -07:00
Michael Kozono 7bc4278e07 Extract Net::LDAP::DN class from ruby-net-ldap gem 2017-10-07 10:28:12 -07:00
Michael Kozono aefc96ca27 Rely on LDAP providers giving DNs, not UIDs 2017-10-07 10:28:12 -07:00
Michael Kozono 010cd3dea8 Rescue DN normalization attempts 2017-10-07 10:28:12 -07:00
Michael Kozono ca5ade22f3 Fix `dn?` for a UID with an escaped equal sign 2017-10-07 10:28:12 -07:00
Michael Kozono fee3c95d75 Remove redundant `is_` 2017-10-07 10:28:12 -07:00
Michael Kozono a3ec58dacf Downcase normalized LDAP DNs and UIDs 2017-10-07 10:28:12 -07:00
Michael Kozono 4ae32d9577 Fix normalize behavior for escaped delimiter chars 2017-10-07 10:28:12 -07:00
Michael Kozono abe570cd0b Refactor to distinguish between UIDs and DNs 2017-10-07 10:28:12 -07:00
Michael Kozono 42bc6caee0 Trim extraneous spaces from DNs 2017-10-07 10:28:12 -07:00
Douwe Maan b40192a946 Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'
Attempt to link saml users to ldap by email

Closes #33493

See merge request gitlab-org/gitlab-ce!14216
2017-10-02 15:24:48 +00:00
Tiago Botelho 011c168bff Refactors SAML identity creation in gl_user. 2017-10-02 11:35:09 +01:00
James Lopez 67d06dee30 refactor users update service 2017-09-28 08:46:39 +02:00
James Lopez 9621dd0c9d refactor services to match EE signature 2017-09-28 08:46:39 +02:00
Tiago Botelho cd85a558dc Creates compound query for LDAP email attributes. 2017-09-25 16:14:22 +01:00
Tiago Botelho 718e5b0865 Attempt to link saml users to ldap by email 2017-09-25 09:44:31 +01:00
Alexander Keramidas 4df54f2607 Profile updates from providers 2017-09-06 16:38:52 +03:00
Douwe Maan c1cf5f4101 Support simple string LDAP attribute specifications, and search for name rather than username attributes 2017-08-23 22:06:22 +02:00
Rémy Coutable fcce6c3168 Merge branch 'rs-more-public-send-whitelists' into 'master'
Whitelist or fix additional `Gitlab/PublicSend` cop violations

See merge request !13467
2017-08-16 11:25:26 +00:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Robert Speicher 260c8da060 Whitelist or fix additional `Gitlab/PublicSend` cop violations
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
Douwe Maan ebd2ed8f64 Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor 2017-07-31 11:43:35 +02:00
Rubén Dávila ef97cb54ae Backport some recent changes related to LDAP from EE 2017-07-27 08:45:16 -05:00
Casper a5d2ce8e61 Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes. 2017-07-26 16:48:13 +00:00
Michael Kozono 7f92a36a36 Fix plain LDAP (no encryption) 2017-07-26 02:43:40 -07:00