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(ssl) requiring upgrade to more secure TLS/1.2 #2119

Merged
merged 1 commit into from
Feb 27, 2017
Merged

chore(ssl) requiring upgrade to more secure TLS/1.2 #2119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ perform significantly better than any previous version.
been added to Kong core, and are configurable via new properties on the API
entity. See the related PR for a detailed explanation of this change.
[#1970](https://github.com/Mashape/kong/pull/1970)
- :warning: Dropping support for unsecure `TLS/1.0` and defaulting `Upgrade`
responses to `TLS/1.2`.
[#2119](https://github.com/Mashape/kong/pull/2119)
- Bump the compatible OpenResty version to `1.11.2.1` and `1.11.2.2`. Support
for OpenResty `1.11.2.2` requires the `--without-luajit-lua52` compilation
flag.
Expand Down
2 changes: 1 addition & 1 deletion kong/core/handler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ return {

if api.https_only and not utils.check_https(api.http_if_terminated) then
ngx.header["connection"] = "Upgrade"
ngx.header["upgrade"] = "TLS/1.0, HTTP/1.1"
ngx.header["upgrade"] = "TLS/1.2, HTTP/1.1"
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be TLS/1.2, TLS/1.1 rather?

Copy link
Member Author

Choose a reason for hiding this comment

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

As far as I understand, the Upgrade header recommends a protocol that the client "may" use, and we recommend TLS/1.2. He can still use TLS/1.1 since it's supported by the server, but we would still recommend the latest one.


return responses.send(426, "Please use HTTPS protocol")
end
Expand Down
2 changes: 1 addition & 1 deletion kong/templates/nginx_kong.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ server {
listen ${{PROXY_LISTEN_SSL}} ssl;
ssl_certificate ${{SSL_CERT}};
ssl_certificate_key ${{SSL_CERT_KEY}};
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_protocols TLSv1.1 TLSv1.2;
ssl_certificate_by_lua_block {
kong.ssl_certificate()
}
Expand Down
2 changes: 1 addition & 1 deletion spec/02-integration/05-proxy/04-ssl_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe("SSL", function()
local body = assert.res_status(426, res)
assert.equal([[{"message":"Please use HTTPS protocol"}]], body)
assert.contains("Upgrade", res.headers.connection)
assert.equal("TLS/1.0, HTTP/1.1", res.headers.upgrade)
assert.equal("TLS/1.2, HTTP/1.1", res.headers.upgrade)
end)

it("blocks request with HTTPS in x-forwarded-proto but no http_if_already_terminated", function()
Expand Down