Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump lua-resty-ldap version for ldap-auth #9037

Merged
merged 39 commits into from
Mar 15, 2023

Conversation

bzp2010
Copy link
Contributor

@bzp2010 bzp2010 commented Mar 8, 2023

Description

A new lua-resty-ldap has been released that provides a completely different API and more new features, we need to upgrade it to exclude API incompatibilities and prepare for another advanced LDAP plugin.

This upgrade is completely non-destructive to the user, and theoretically any test cases do not need to be modified to prove compatibility.

Head of #9022

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

@bzp2010 bzp2010 self-assigned this Mar 8, 2023
@bzp2010 bzp2010 requested review from spacewander and soulbird March 13, 2023 10:48
@bzp2010 bzp2010 marked this pull request as ready for review March 13, 2023 10:48
@@ -100,6 +100,11 @@ local function extract_auth_header(authorization)
end

function _M.rewrite(conf, ctx)
if not ok then -- ensure rasn library loaded
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For code style, we return 501 in the other similar cases:

if not is_apisix_or then
core.log.error("need to build APISIX-Base to support setting gzip")
return 501
end

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed

ci/common.sh Outdated
@@ -56,6 +56,19 @@ rerun_flaky_tests() {
FLUSH_ETCD=1 prove --timer -I./test-nginx/lib -I./ $(echo "$tests" | xargs)
}

install_curl () {
wget https://curl.se/download/curl-7.88.0.tar.gz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about exacting the version out like the other install_xxx function?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it makes sense, fixed.

@bzp2010 bzp2010 requested a review from spacewander March 14, 2023 02:04
@bzp2010 bzp2010 merged commit e1aabd3 into apache:master Mar 15, 2023
hongbinhsu added a commit to fitphp/apix that referenced this pull request Mar 17, 2023
* upstream/master: (46 commits)
  fix(consumer): work if the etcd connection failed during starting (apache#9077)
  ci: fix low disk space error when loading saved docker images (apache#9080)
  change: change the default router from radixtree uri to radixtree hos… (apache#9047)
  chore(deps): bump dubbo from 2.7.18 to 2.7.21 in /t/lib/dubbo-backend/dubbo-backend-provider (apache#9041)
  fix: cli test on master (apache#9075)
  fix: Non wildcard origin in CORS should sent Vary header (apache#9010)
  feat: bump lua-resty-ldap version for ldap-auth (apache#9037)
  fix: invalidate cache in core.request.add_haeder and fix some calls (apache#8824)
  docs: remove unnecessary getting-started.md (apache#9054)
  docs: contribute Getting Started tutorials (apache#9046)
  docs: replace full-width quotation mark with half-width quotation mark (apache#8887)
  docs: fix typo and grammar (apache#9008)
  feat: ready to release 2.15.3 (apache#9021)
  ci: ensure the test can run with different repo name (apache#8832)
  chore(deps): bump golang.org/x/net from 0.0.0-20220722155237-a158d28d115b to 0.7.0 in /ci/pod/openfunction/function-example/test-uri (apache#9018)
  docs: improved SEO & fixed typo and localization issues (apache#8993)
  feat: release APISIX 3.2.0 (apache#8988)
  docs: fix grammar (apache#8935)
  docs: fix indent in encrypted-storage-fields (apache#8876)
  docs: k8s discovery: state the restriction on the use of port number (apache#8969)
  ...
AlinsRan pushed a commit to AlinsRan/apisix that referenced this pull request Jun 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants