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

chore: upgrade openresty version to v1.27.11 #11936

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+8 −7
Open

chore: upgrade openresty version to v1.27.11 #11936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f116ef3
chore: upgrade openresty version to v1.27.11
shreemaan-abhishek Jan 22, 2025
e6c382d
rm openssl.cnf
shreemaan-abhishek Jan 22, 2025
7020410
Revert "rm openssl.cnf"
shreemaan-abhishek Jan 23, 2025
a3dc164
tmate
shreemaan-abhishek Jan 28, 2025
0454f25
Revert "tmate"
shreemaan-abhishek Jan 28, 2025
ec13a45
pcre error lang update
shreemaan-abhishek Jan 30, 2025
157d556
grpc log update
shreemaan-abhishek Jan 30, 2025
a283926
verify_client API update
shreemaan-abhishek Jan 30, 2025
5a68c47
pcre -> pcre2
shreemaan-abhishek Jan 30, 2025
3f85daa
grpc log update
shreemaan-abhishek Feb 4, 2025
7eca3d6
update grpc log 2
shreemaan-abhishek Feb 4, 2025
b0c9d55
use release link
shreemaan-abhishek Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

APISIX_PACKAGE_NAME=apisix

APISIX_RUNTIME=1.2.1
APISIX_RUNTIME=1.3.0
3 changes: 2 additions & 1 deletion apisix/ssl/router/radixtree_sni.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ function _M.set(matched_ssl, sni)
local reject_in_handshake =
(ngx.config.subsystem == "stream") or
(matched_ssl.value.client.skip_mtls_uri_regex == nil)
local ok, err = ngx_ssl.verify_client(parsed_cert, depth,
-- TODO: support passing `trusted_certs` (3rd arg, keep it nil for now)
local ok, err = ngx_ssl.verify_client(parsed_cert, depth, nil,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the verify client API has changed and it expects 4 parameters now, the 3rd parameter is trusted_certs, we can implement the support for trusted certs later.

reject_in_handshake)
if not ok then
return false, err
Expand Down
4 changes: 2 additions & 2 deletions t/node/grpc-proxy.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ routes:
GET /hello
--- error_code: 502
--- error_log
upstream: "grpcs://127.0.0.1:443"
connect() failed (111: Connection refused) while connecting to upstream
Expand All @@ -188,7 +188,7 @@ routes:
GET /hello
--- error_code: 502
--- error_log
upstream: "grpc://127.0.0.1:80"
connect() failed (111: Connection refused) while connecting to upstream
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this change is needed as grpc proxy is done under subrequest, and the apisix custom logger (in apisix-nginx-module) overrides the original log handler of nginx and stores the reference to the original log handler in ctx.

but ngx_stash_ctx fails to store reference to that log handler. Thus the original log handler doesn't get executed and the upstream: "grpc: ..." field in error log is not present.

Expand Down
2 changes: 1 addition & 1 deletion t/plugin/proxy-mirror3.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ grpcurl -import-path ./t/grpc_server_example/proto -proto helloworld.proto -plai
"message": "Hello apisix"
}
--- error_log eval
qr/Connection refused\) while connecting to upstream.*proxy_mirror_grpc/
qr/Connection refused\) while connecting to upstream/
4 changes: 2 additions & 2 deletions t/plugin/uri-blocker.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ location /t {
GET /t
--- error_code: 400
--- response_body
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \".+(\""}
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \".+(\""}



Expand Down Expand Up @@ -112,7 +112,7 @@ location /t {
GET /t
--- error_code: 400
--- response_body
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre_compile() failed: missing ) in \"^b(\""}
{"error_msg":"failed to check the configuration of plugin uri-blocker err: pcre2_compile() failed: missing closing parenthesis in \"^b(\""}



Expand Down
Loading