From 395488a1a615bdc8928981e4d006766e406e1d11 Mon Sep 17 00:00:00 2001 From: HParker Date: Thu, 13 May 2021 09:37:36 -0700 Subject: [PATCH 1/8] Loosen net-ldap requirement this allows for ldap 0.17.0 This version of net-ldap is required to run ruby 3 without warnings --- github-ldap.gemspec | 2 +- lib/github/ldap.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/github-ldap.gemspec b/github-ldap.gemspec index f39a6dd..a2dad47 100644 --- a/github-ldap.gemspec +++ b/github-ldap.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency 'net-ldap', '~> 0.16.0' + spec.add_dependency 'net-ldap', '> 0.16.0' spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency 'ladle' diff --git a/lib/github/ldap.rb b/lib/github/ldap.rb index 0bf5be2..33e6627 100644 --- a/lib/github/ldap.rb +++ b/lib/github/ldap.rb @@ -228,7 +228,7 @@ def capabilities instrument "capabilities.github_ldap" do |payload| begin @connection.search_root_dse - rescue Net::LDAP::LdapError => error + rescue Net::LDAP::Error => error payload[:error] = error # stubbed result Net::LDAP::Entry.new From 3f1216f0df1ee1e48dbcb95a930a618457f65104 Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:17:06 +0000 Subject: [PATCH 2/8] Fix minitest require --- test/test_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 856cb5c..c29703b 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -13,7 +13,7 @@ require 'minitest/mock' require 'minitest/autorun' -require 'mocha/mini_test' +require 'mocha/minitest' if ENV.fetch('TESTENV', "apacheds") == "apacheds" # Make sure we clean up running test server From b1b0361d7d74acbfee6e1a3c18b94fe276ecbe82 Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:25:52 +0000 Subject: [PATCH 3/8] Fix Minitest::Result requirement --- test/member_search/active_directory_test.rb | 6 ++++-- test/membership_validators/active_directory_test.rb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/member_search/active_directory_test.rb b/test/member_search/active_directory_test.rb index e3f367a..19f2c96 100644 --- a/test/member_search/active_directory_test.rb +++ b/test/member_search/active_directory_test.rb @@ -3,7 +3,8 @@ class GitHubLdapActiveDirectoryMemberSearchStubbedTest < GitHub::Ldap::Test # Only run when AD integration tests aren't run def run(*) - self.class.test_env != "activedirectory" ? super : self + return super if self.class.test_env != "activedirectory" + Minitest::Result.from(self) end def find_group(cn) @@ -46,7 +47,8 @@ def test_finds_deeply_nested_group_members class GitHubLdapActiveDirectoryMemberSearchIntegrationTest < GitHub::Ldap::Test # Only run this test suite if ActiveDirectory is configured def run(*) - self.class.test_env == "activedirectory" ? super : self + return super if self.class.test_env == "activedirectory" + Minitest::Result.from(self) end def find_group(cn) diff --git a/test/membership_validators/active_directory_test.rb b/test/membership_validators/active_directory_test.rb index 956fbc5..2160f8d 100644 --- a/test/membership_validators/active_directory_test.rb +++ b/test/membership_validators/active_directory_test.rb @@ -3,7 +3,8 @@ class GitHubLdapActiveDirectoryMembershipValidatorsStubbedTest < GitHub::Ldap::Test # Only run when AD integration tests aren't run def run(*) - self.class.test_env != "activedirectory" ? super : self + return super if self.class.test_env != "activedirectory" + Minitest::Result.from(self) end def setup @@ -72,7 +73,8 @@ def test_does_not_validate_user_not_in_any_group class GitHubLdapActiveDirectoryMembershipValidatorsIntegrationTest < GitHub::Ldap::Test # Only run this test suite if ActiveDirectory is configured def run(*) - self.class.test_env == "activedirectory" ? super : self + return super if self.class.test_env == "activedirectory" + Minitest::Result.from(self) end def setup From 16b8a38e43288e9fb9ddbf642428ac855220a0af Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:26:32 +0000 Subject: [PATCH 4/8] Fix libodbc1 dependency Add source to make slapd dependency available. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 798c5c4..d9fd02b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,10 @@ addons: - ad1.ghe.dev - ad2.ghe.dev +before_install: + - echo "deb http://ftp.br.debian.org/debian stable main" | sudo tee -a /etc/apt/sources.list + - sudo apt-get update + install: - if [ "$TESTENV" = "openldap" ]; then ./script/install-openldap; fi - bundle install From ebfe3c589fe6df5a4a0da70a7babe4d8b5c181c7 Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:34:59 +0000 Subject: [PATCH 5/8] Remove DB_CONFIG instructions This config file is not installed anymore. --- script/install-openldap | 2 -- 1 file changed, 2 deletions(-) diff --git a/script/install-openldap b/script/install-openldap index bb0033f..2deddad 100755 --- a/script/install-openldap +++ b/script/install-openldap @@ -13,10 +13,8 @@ TMPDIR=$(mktemp -d) cd $TMPDIR # Delete data and reconfigure. -sudo cp -v /var/lib/ldap/DB_CONFIG ./DB_CONFIG sudo rm -rf /etc/ldap/slapd.d/* sudo rm -rf /var/lib/ldap/* -sudo cp -v ./DB_CONFIG /var/lib/ldap/DB_CONFIG sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/slapd.conf.ldif # Load memberof and ref-int overlays and configure them. sudo slapadd -F /etc/ldap/slapd.d -b "cn=config" -l $BASE_PATH/memberof.ldif From 8cd5fb162295e0b0e11a1eef0fbc8127c14c5562 Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:36:22 +0000 Subject: [PATCH 6/8] Return a Result --- test/test_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index c29703b..e92caa6 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -31,8 +31,9 @@ def self.test_env def self.run(reporter, options = {}) start_server - super + result = super stop_server + result end def self.stop_server From 1f623fd6559b2c0ef65a30d211fb76fe06786fcb Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 21:43:00 +0000 Subject: [PATCH 7/8] Fix Minitest::Result requirement --- test/domain_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/domain_test.rb b/test/domain_test.rb index d54850c..4fc0dee 100644 --- a/test/domain_test.rb +++ b/test/domain_test.rb @@ -236,7 +236,8 @@ def test_membership_for_posixGroups class GitHubLdapActiveDirectoryGroupsTest < GitHub::Ldap::Test def run(*) - self.class.test_env == "activedirectory" ? super : self + return super if self.class.test_env == "activedirectory" + Minitest::Result.from(self) end def test_filter_groups From f676fc1d894ef1e1139871e138a3f0c71a8ebcf6 Mon Sep 17 00:00:00 2001 From: Matt Todd Date: Tue, 1 Jun 2021 22:08:01 +0000 Subject: [PATCH 8/8] Fix stub to return an Array Fixes issue with calling to_ary on stubbed result. --- test/user_search/active_directory_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/user_search/active_directory_test.rb b/test/user_search/active_directory_test.rb index 2aec199..32bed79 100644 --- a/test/user_search/active_directory_test.rb +++ b/test/user_search/active_directory_test.rb @@ -20,7 +20,7 @@ def test_global_catalog_returns_array_of_results mock_global_catalog_connection = mock("GitHub::Ldap::UserSearch::GlobalCatalog") stub_entry = mock("Net::LDAP::Entry") - mock_global_catalog_connection.expects(:search).returns(stub_entry) + mock_global_catalog_connection.expects(:search).returns([stub_entry]) ad_user_search.expects(:global_catalog_connection).returns(mock_global_catalog_connection) results = ad_user_search.perform("login", "CN=Joe", "uid", {}) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy