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.

Sign up for GitHub

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

Jump to bottom

feat: support host level dynamic setting of tls protocol version #9903

Merged
merged 14 commits into from
Aug 4, 2023
Merged

feat: support host level dynamic setting of tls protocol version #9903

merged 14 commits into from
Aug 4, 2023

Conversation

AlinsRan
Copy link
Contributor

@AlinsRan AlinsRan commented Jul 26, 2023 •
edited
Loading

Description

Fixes #9885

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)

@AlinsRan AlinsRan force-pushed the feat/ssl_protocols branch 6 times, most recently from b0db19b to 44a00a3 Compare July 26, 2023 20:19
@AlinsRan AlinsRan marked this pull request as ready for review July 28, 2023 02:19
@AlinsRan AlinsRan force-pushed the feat/ssl_protocols branch 5 times, most recently from dd8bfd4 to 49773e3 Compare July 31, 2023 15:07
leslie-tsang
leslie-tsang reviewed Aug 1, 2023
View reviewed changes
apisix/init.lua Outdated Show resolved Hide resolved
apisix/init.lua Outdated Show resolved Hide resolved
apisix/ssl.lua Outdated Show resolved Hide resolved
apisix/ssl.lua Outdated Show resolved Hide resolved
apisix/ssl.lua Show resolved Hide resolved
apisix/ssl/router/radixtree_sni.lua Outdated Show resolved Hide resolved
apisix/ssl/router/radixtree_sni.lua Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/zh/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
@AlinsRan @leslie-tsang
Apply suggestions from code review
c0bba54 
Co-authored-by: leslie <leslie@apache.org>
@AlinsRan
Copy link
Contributor Author

AlinsRan commented Aug 1, 2023

@kayx23 Please help review the doc.

kayx23
kayx23 reviewed Aug 1, 2023
View reviewed changes
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
docs/en/latest/ssl-protocol.md Outdated Show resolved Hide resolved
AlinsRan and others added 2 commits August 1, 2023 15:36
@AlinsRan @leslie-tsang @kayx23
Apply suggestions from code review
92e74d1 
Co-authored-by: leslie <leslie@apache.org>
Co-authored-by: Traky Deng <trakydeng@gmail.com>
@AlinsRan
update doc and fix test cases
4f9bf96
leslie-tsang
leslie-tsang reviewed Aug 2, 2023
View reviewed changes
apisix/ssl/router/radixtree_sni.lua
if not matched_ssl then
return false, "failed to match ssl certificate"
end
local ok, err
Copy link
Member

Choose a reason for hiding this comment

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

unused var ok here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Line 242 has.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, err = _M.set_cert_and_key(sni, new_ssl_value)

apisix/schema_def.lua Outdated Show resolved Hide resolved
@AlinsRan @leslie-tsang
Update apisix/schema_def.lua
478e1b8 
Co-authored-by: leslie <leslie@apache.org>
kingluo
kingluo previously approved these changes Aug 2, 2023
View reviewed changes
monkeyDluffy6017
monkeyDluffy6017 reviewed Aug 2, 2023
View reviewed changes
apisix/init.lua Outdated Show resolved Hide resolved
@monkeyDluffy6017 monkeyDluffy6017 added the wait for update wait for the author's response in this issue/PR label Aug 2, 2023
@monkeyDluffy6017 monkeyDluffy6017 added approved and removed wait for update wait for the author's response in this issue/PR labels Aug 4, 2023
@monkeyDluffy6017 monkeyDluffy6017 merged commit a4038d5 into apache:master Aug 4, 2023
34 checks passed
rubikplanet pushed a commit to rubikplanet/apisix that referenced this pull request Aug 8, 2023
@AlinsRan @rubikplanet
feat: support host level dynamic setting of tls protocol version (apa…
62bd08d 
…che#9903)
This was referenced Sep 12, 2023
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kingluo kingluo kingluo approved these changes

@monkeyDluffy6017 monkeyDluffy6017 monkeyDluffy6017 approved these changes

@lingsamuel lingsamuel Awaiting requested review from lingsamuel

@kayx23 kayx23 Awaiting requested review from kayx23

@leslie-tsang leslie-tsang Awaiting requested review from leslie-tsang

Assignees
No one assigned
Labels
approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

feat: Support host level dynamic setting of tls protocol version
5 participants
@AlinsRan @kingluo @monkeyDluffy6017 @kayx23 @leslie-tsang