gitlab_omniauth-ldap 2.1.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6d0257f9f6fc7f3368403940bba04ecc860b8c52
-  data.tar.gz: 706ce31f13aa10bc0e5e982ae2ad52d611ec1dbd
+SHA256:
+  metadata.gz: 25feeb3ba0d219352e71ab7ada2e2daf80c7fb94a552985cfb012e7582476aa2
+  data.tar.gz: b80f443e17e0afe34510eae3918039806a61c9a53012b8eff41653c93922638e
 SHA512:
-  metadata.gz: 22c81461f04cd89702366adabeeff539195a887f046ebd1d0235f9bbbed2d0c8ace4a74e151924a37d330de3806727475e2d27790a328eb824e623e1e0e9295d
-  data.tar.gz: 29bcd91f9be90911956f7891f81f33fcc591c0258861e2a99f2b99312b8ae6473cec4dfcef4dd535081254530e8e50b0968aa385b127ba530459ec97ba2ae6c7
+  metadata.gz: 6f970c0e9b3380d132f5073039ed3486c6e8f6bbd180e9ef9b059db3591391f837f75f99f1805a5e7da872acb12cb1ea360c5fdb4275294fd9506272df7d98a5
+  data.tar.gz: 4b97d19722ade8113abe4c829bd3cfc40957a5983cf66f8096a97a03bd4d270145394ce3609d6cbd3b6014c081f6994d464f5ea22c2064c9b63001e33c59b8c9

data/.gitlab-ci.yml

@@ -1,12 +1,23 @@
-image: "ruby:2.3.1"
-
-before_script:
-  - bundle install
+default:
+  image: "ruby:${RUBY_VERSION}"
 
 stages:
   - test
+  - deploy
 
-rspec:
-  stage: test
+.test-template: &test
+  before_script:
+    - bundle install
   script:
     - bundle exec rake spec
+
+rspec:
+  parallel:
+    matrix:
+      - RUBY_VERSION: [ "2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
+  <<: *test
+
+include:
+  - component: gitlab.com/gitlab-org/components/gem-release/gem-release@main
+    inputs:
+      gem_name: gitlab_omniauth-ldap

data/gitlab_omniauth-ldap.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://gitlab.com/gitlab-org/omniauth-ldap"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency     'omniauth', '~> 1.3'
+  gem.add_runtime_dependency     'omniauth', '>= 1.3', '< 3'
   gem.add_runtime_dependency     'net-ldap', '~> 0.16'
   gem.add_runtime_dependency     'pyu-ruby-sasl', '>= 0.0.3.3', '< 0.1'
   gem.add_runtime_dependency     'rubyntlm', '~> 0.5'

data/lib/omniauth/strategies/ldap.rb

@@ -46,10 +46,10 @@ module OmniAuth
         return fail!(:invalid_request_method) unless valid_request_method?
         return fail!(:missing_credentials) if missing_credentials?
         begin
-          @ldap_user_info = @adaptor.bind_as(:filter => filter(@adaptor), :size => 1, :password => request['password'])
+          @ldap_user_info = @adaptor.bind_as(:filter => filter(@adaptor), :size => 1, :password => request.params['password'])
 
           unless @ldap_user_info
-            return fail!(:invalid_credentials, InvalidCredentialsError.new("Invalid credentials for #{request['username']}"))
+            return fail!(:invalid_credentials, InvalidCredentialsError.new("Invalid credentials for #{request.params['username']}"))
           end
 
           @user_info = self.class.map_user(@@config, @ldap_user_info)
@@ -61,10 +61,10 @@ module OmniAuth
 
       def filter(adaptor)
         if adaptor.filter and !adaptor.filter.empty?
-          username = Net::LDAP::Filter.escape(@options[:name_proc].call(request['username']))
+          username = Net::LDAP::Filter.escape(@options[:name_proc].call(request.params['username']))
           Net::LDAP::Filter.construct(adaptor.filter % { username: username })
         else
-          Net::LDAP::Filter.equals(adaptor.uid, @options[:name_proc].call(request['username']))
+          Net::LDAP::Filter.equals(adaptor.uid, @options[:name_proc].call(request.params['username']))
         end
       end
 
@@ -107,7 +107,7 @@ module OmniAuth
       end
 
       def missing_credentials?
-        request['username'].nil? or request['username'].empty? or request['password'].nil? or request['password'].empty?
+        request.params['username'].nil? or request.params['username'].empty? or request.params['password'].nil? or request.params['password'].empty?
       end # missing_credentials?
     end
   end

data/lib/omniauth-ldap/adaptor.rb

@@ -4,7 +4,6 @@ require 'rack'
 require 'net/ldap'
 require 'net/ntlm'
 require 'sasl'
-require 'kconv'
 module OmniAuth
   module LDAP
     class Adaptor

data/lib/omniauth-ldap/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module LDAP
-    VERSION = "2.1.1"
+    VERSION = "2.3.0"
   end
 end

data/spec/omniauth/strategies/ldap_spec.rb

@@ -30,7 +30,20 @@ describe "OmniAuth::Strategies::LDAP" do
   end
 
   describe '/auth/ldap' do
-    before(:each){ get '/auth/ldap' }
+    let!(:csrf_token) { SecureRandom.base64(32) }
+    let(:post_env) { make_env('/auth/ldap', 'rack.session' => { csrf: csrf_token }, 'rack.input' => StringIO.new("authenticity_token=#{escaped_token}")) }
+    let(:escaped_token) { URI.encode_www_form_component(csrf_token, Encoding::UTF_8) }
+
+    before(:each) { post '/auth/ldap', nil, post_env }
+
+    def make_env(path = '/auth/ldap', props = {})
+      {
+        'REQUEST_METHOD' => 'POST',
+        'PATH_INFO' => path,
+        'rack.session' => {},
+        'rack.input' => StringIO.new('test=true')
+      }.merge(props)
+    end
 
     it 'should display a form' do
       last_response.status.should == 200

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_omniauth-ldap
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ping Yu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: net-ldap
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +144,6 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -156,7 +161,7 @@ homepage: https://gitlab.com/gitlab-org/omniauth-ldap
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,12 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A LDAP strategy for OmniAuth.
-test_files:
-- spec/omniauth-ldap/adaptor_spec.rb
-- spec/omniauth/strategies/ldap_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-branches:
-  only:
-    - 'master'
-rvm:
-  - 2.0.0
-  - 2.1.5
-script: "bundle exec rspec spec"