-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
fix: allow trailing period in SNI and CN for SSL #11414
Merged
shreemaan-abhishek
merged 7 commits into
apache:master
from
shreemaan-abhishek:fix-trailing-dot
Jul 18, 2024
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e9ccfa7
fix: allow trailing dot in SNI for SSL
shreemaan-abhishek 934eb42
remove dibag :P
shreemaan-abhishek e6fd39b
add license header
shreemaan-abhishek 4473a44
remove debug log
shreemaan-abhishek 5519164
spell fix
shreemaan-abhishek 6c4e1b8
remove traceback
shreemaan-abhishek d556af1
Revert "remove debug log"
shreemaan-abhishek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
-----BEGIN CERTIFICATE----- | ||
MIIC+zCCAeOgAwIBAgIUWUtIDbrU8QF90OXlMKyClPRNRcgwDQYJKoZIhvcNAQEL | ||
BQAwETEPMA0GA1UEAwwGUk9PVENBMCAXDTI0MDcxNzE2MDcyM1oYDzIxMjQwNjIz | ||
MTYwNzIzWjAYMRYwFAYDVQQDDA13d3cudGVzdC5jb20uMIIBIjANBgkqhkiG9w0B | ||
AQEFAAOCAQ8AMIIBCgKCAQEApkX5NgwwEC/brmrUAfxSMGMaYOzjx+3BlCC23sLR | ||
0uQ1+KMXt/Pd2QJVqREjEAiwXCMuHbB0qWD5985SfsjeRJJ8rc8CzJfcb7QESKfK | ||
GdLaD8LsyAAg+Rxm0QyVFGrLJ82sjbEimLGCkLMpYsePxEDEifKPp3Z9bRUFT0zm | ||
xcUEXojw5pzjrjIvfqVenWNP716s7bSdOFoc4RBlAdEI3pFUasLF9Lovz7BJLvtY | ||
aoqgCNfb78C6zreDLswET5/338AVf9yPYc5HOthmygxkYTniK47/fOW64RQKXQ2X | ||
EtBiIzN6dSXfTCXSpvow5XIR02rLoxsVEEwM9ODgUAJg6QIDAQABo0IwQDAdBgNV | ||
HQ4EFgQUAHYNW6/hFM+Bqd2KNBXbLgJLaxcwHwYDVR0jBBgwFoAUjwSzlti+ag+f | ||
BzoRa0wZbMaGh10wDQYJKoZIhvcNAQELBQADggEBAA1HfiDtHZV8sxJjasnNSM9f | ||
6XTRCjT+DcABXm7k/Dmb8q5rpyqYwkUfadgAbmPx6T/dC4z7LblkcTkwD7azpkNE | ||
fXY3Hx4qxSVSbSOHWnaSOX/8BRiPbSQNWGyTGh9AK/Vp/VJU2cDPqFbjQKHFq3ZI | ||
w3GnRDerdA8vm5qzJ5/9wMF2ZsmnMiV3zX0Xisbzx/dponz6ktfygE3bk8Pb4wKt | ||
D0EjbnLIXwyHv1czJrcRq0Y8irWaTY97vdff/J2aO9582zFNx6AnsU3+6fGsDyrO | ||
ss+ggKDLK+aOBKroTNb3TgdPyPOgobUwLByFdKT/zTtWbkqyYMZzBme2SD4TWok= | ||
-----END CERTIFICATE----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
-----BEGIN PRIVATE KEY----- | ||
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCmRfk2DDAQL9uu | ||
atQB/FIwYxpg7OPH7cGUILbewtHS5DX4oxe3893ZAlWpESMQCLBcIy4dsHSpYPn3 | ||
zlJ+yN5EknytzwLMl9xvtARIp8oZ0toPwuzIACD5HGbRDJUUassnzayNsSKYsYKQ | ||
sylix4/EQMSJ8o+ndn1tFQVPTObFxQReiPDmnOOuMi9+pV6dY0/vXqzttJ04Whzh | ||
EGUB0QjekVRqwsX0ui/PsEku+1hqiqAI19vvwLrOt4MuzARPn/ffwBV/3I9hzkc6 | ||
2GbKDGRhOeIrjv985brhFApdDZcS0GIjM3p1Jd9MJdKm+jDlchHTasujGxUQTAz0 | ||
4OBQAmDpAgMBAAECggEAD84ctm8h5fYApDOWJ8Kp9tzCwgYekE94vEmATIw5CPqF | ||
qVbqbyNUmhdTWGzvN+vVhMqYzHxsmHmmBTDU7WWPYDYK+TQRbGx+iRUz54qghsQg | ||
04j4PDor6DYTjWlMZfqRSV0u+vCErP5JnpLTOyckUrfD3ueCUX0tRsBN5wf0s0WD | ||
7AiUIdVBesQwIuIin3MyhGFtQC0PNta3NdSBVbnUA69OL3QNxPoai5LACrAf1hkf | ||
wPD/y6y2CswdER+j+obPChjTcnJFjRCkqqO+66QZWmMmVxq4ymCQg9IOgLRWtfhI | ||
6Ts5RxVn12kEuPULk9oHHOjC+MVh3BmWFLb58G/gwQKBgQDUCSd/2uswTVlTYpw6 | ||
XO3iVyoZVeo/BIiOm/kjmqmr5U/D7ZO27ElKBTe9CDQ4WB5PuisCy0/SnsJJsPpf | ||
pWif2v0mVs3T9K7J1M1yQU2iMs+Z2stzLGe5AASImYpw9091v57A/1jI4VUoodOr | ||
7sMo+9ROqx6dTG/tJgUa+VZaKQKBgQDIv8CZHv4LqvQEQrGoTcKOxQP47nsbfEPW | ||
B0GQscykvRTWxlTfFdfFM4VG2ApERZDwjPFU84n4dH8J7P14iy2ty70krzHWNfjY | ||
y52CXUb295HsdcQ0bP8wztuvM/Jfh1mKKynmezvAZlTSb+GMAAMrReuG2Ga1/gp1 | ||
5daCd4IowQKBgG//md6eCybLZIh4CN+HIJwywGj7iazZvyvc1T9qPX8vs+9g+Wpg | ||
6uFvWh6+S58LZI9mXbuvGq288BEuq0GERHxTlu3+YeA4WW8AubhFKDWpsyCogliG | ||
tw7wJHTm7Up4R3+BxOBawFHzPCEnQYCKsIlgY6deGeCqdGCGeaHi3CrpAoGAdWam | ||
xSW53qr4j/FNIqdvK72OaCtX9agDqAyQTIWer40gvcY5ZknI6TwLKnY38ttYO0XB | ||
8TOIMbQ3g1+EkNWcPjKTh/upQqRHxsm1cMMKOG5qeYYZ26sOxsWC9oCDs1hdhg9e | ||
LrtNI2T1IChsGEr9j3YRmse9sZtDFNX4UE6B4UECgYEAsuRRQK0tgvcsQxkX/bZb | ||
VTKqI4ezGRLXuavBe42xWOBLFzEujGvbZMbxzD4F4H1dfVVor3ItAEoybC37jtHI | ||
uEWLAQtZtNyDCOiq4UuwbmtIqtoJz556QUrwO0KdPPjg/jyZTxs5jdKRMk9bsfmR | ||
80vnuQpr0CZe8EgHiMoysrs= | ||
-----END PRIVATE KEY----- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,283 @@ | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
use t::APISIX 'no_plan'; | ||
|
||
log_level('debug'); | ||
no_root_location(); | ||
|
||
BEGIN { | ||
$ENV{TEST_NGINX_HTML_DIR} ||= html_dir(); | ||
} | ||
|
||
add_block_preprocessor(sub { | ||
my ($block) = @_; | ||
|
||
if (!$block->request) { | ||
$block->set_value("request", "GET /t"); | ||
} | ||
|
||
}); | ||
|
||
|
||
run_tests; | ||
|
||
__DATA__ | ||
|
||
=== TEST 1: set sni with trailing period | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
local core = require("apisix.core") | ||
local t = require("lib.test_admin") | ||
|
||
local ssl_cert = t.read_file("t/certs/test2.crt") | ||
local ssl_key = t.read_file("t/certs/test2.key") | ||
local data = {cert = ssl_cert, key = ssl_key, sni = "*.test.com"} | ||
|
||
local code, body = t.test('/apisix/admin/ssls/1', | ||
ngx.HTTP_PUT, | ||
core.json.encode(data) | ||
) | ||
|
||
ngx.status = code | ||
ngx.say(body) | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
passed | ||
--- error_code: 201 | ||
|
||
|
||
|
||
=== TEST 2: match against sni with no trailing period | ||
--- config | ||
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl; | ||
|
||
location /t { | ||
content_by_lua_block { | ||
do | ||
local sock = ngx.socket.tcp() | ||
|
||
sock:settimeout(2000) | ||
|
||
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock") | ||
if not ok then | ||
ngx.say("failed to connect: ", err) | ||
return | ||
end | ||
|
||
local sess, err = sock:sslhandshake(nil, "a.test.com.", false) | ||
if not sess then | ||
ngx.say("failed to do SSL handshake: ", err) | ||
return | ||
end | ||
ngx.say("ssl handshake: ", sess ~= nil) | ||
end -- do | ||
-- collectgarbage() | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
ssl handshake: true | ||
|
||
|
||
|
||
=== TEST 3: set snis with trailing period | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
local core = require("apisix.core") | ||
local t = require("lib.test_admin") | ||
|
||
local ssl_cert = t.read_file("t/certs/test2.crt") | ||
local ssl_key = t.read_file("t/certs/test2.key") | ||
local data = {cert = ssl_cert, key = ssl_key, snis = {"test2.com", "a.com"}} | ||
|
||
local code, body = t.test('/apisix/admin/ssls/1', | ||
ngx.HTTP_PUT, | ||
core.json.encode(data) | ||
) | ||
|
||
ngx.status = code | ||
ngx.say(body) | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
passed | ||
|
||
|
||
|
||
=== TEST 4: match against sni with no trailing period | ||
--- config | ||
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl; | ||
|
||
location /t { | ||
content_by_lua_block { | ||
do | ||
local sock = ngx.socket.tcp() | ||
|
||
sock:settimeout(2000) | ||
|
||
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock") | ||
if not ok then | ||
ngx.say("failed to connect: ", err) | ||
return | ||
end | ||
|
||
local sess, err = sock:sslhandshake(nil, "test2.com.", false) | ||
if not sess then | ||
ngx.say("failed to do SSL handshake: ", err) | ||
return | ||
end | ||
ngx.say("ssl handshake: ", sess ~= nil) | ||
end -- do | ||
-- collectgarbage() | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
ssl handshake: true | ||
|
||
|
||
|
||
=== TEST 5: set ssl(sni: www.test.com.) | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
local core = require("apisix.core") | ||
local t = require("lib.test_admin") | ||
local ssl_cert = t.read_file("t/certs/test-dot.crt") | ||
local ssl_key = t.read_file("t/certs/test-dot.key") | ||
local data = {cert = ssl_cert, key = ssl_key, sni = "www.test.com."} | ||
local code, body = t.test('/apisix/admin/ssls/1', | ||
ngx.HTTP_PUT, | ||
core.json.encode(data), | ||
[[{ | ||
"value": { | ||
"sni": "www.test.com." | ||
}, | ||
"key": "/apisix/ssls/1" | ||
}]] | ||
) | ||
ngx.status = code | ||
ngx.say(body) | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
passed | ||
|
||
|
||
|
||
=== TEST 6: set route(id: 1) | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
local t = require("lib.test_admin").test | ||
local code, body = t('/apisix/admin/routes/1', | ||
ngx.HTTP_PUT, | ||
[[{ | ||
"upstream": { | ||
"nodes": { | ||
"127.0.0.1:1980": 1 | ||
}, | ||
"type": "roundrobin" | ||
}, | ||
"uri": "/hello" | ||
}]] | ||
) | ||
if code >= 300 then | ||
ngx.status = code | ||
end | ||
ngx.say(body) | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
passed | ||
|
||
|
||
|
||
=== TEST 7: client request | ||
--- config | ||
listen unix:$TEST_NGINX_HTML_DIR/nginx.sock ssl; | ||
location /t { | ||
content_by_lua_block { | ||
-- etcd sync | ||
ngx.sleep(0.2) | ||
do | ||
local sock = ngx.socket.tcp() | ||
sock:settimeout(2000) | ||
local ok, err = sock:connect("unix:$TEST_NGINX_HTML_DIR/nginx.sock") | ||
if not ok then | ||
ngx.say("failed to connect: ", err) | ||
return | ||
end | ||
ngx.say("connected: ", ok) | ||
local sess, err = sock:sslhandshake(nil, "www.test.com", false) | ||
if not sess then | ||
ngx.say("failed to do SSL handshake: ", err) | ||
return | ||
end | ||
ngx.say("ssl handshake: ", sess ~= nil) | ||
local req = "GET /hello HTTP/1.0\r\nHost: www.test.com\r\nConnection: close\r\n\r\n" | ||
local bytes, err = sock:send(req) | ||
if not bytes then | ||
ngx.say("failed to send http request: ", err) | ||
return | ||
end | ||
ngx.say("sent http request: ", bytes, " bytes.") | ||
while true do | ||
local line, err = sock:receive() | ||
if not line then | ||
-- ngx.say("failed to receive response status line: ", err) | ||
break | ||
end | ||
ngx.say("received: ", line) | ||
end | ||
local ok, err = sock:close() | ||
ngx.say("close: ", ok, " ", err) | ||
end -- do | ||
-- collectgarbage() | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body eval | ||
qr{connected: 1 | ||
ssl handshake: true | ||
sent http request: 62 bytes. | ||
received: HTTP/1.1 200 OK | ||
received: Content-Type: text/plain | ||
received: Content-Length: 12 | ||
received: Connection: close | ||
received: Server: APISIX/\d\.\d+(\.\d+)? | ||
received: \nreceived: hello world | ||
close: 1 nil} | ||
--- error_log | ||
server name: "www.test.com" | ||
--- no_error_log | ||
[error] | ||
[alert] |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we remove this debug log? others LGTM