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

api: add SSL support #200

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Conversation

themilchenko
Copy link
Contributor

@themilchenko themilchenko commented Nov 8, 2024

It wasn't SSL support. After the patch it was added there are several options to configure SSL:

  • ssl_cert_file is a path to the SSL cert file;
  • ssl_key_file is a path to the SSL key file;
  • ssl_ca_file is a path to the SSL CA file;
  • ssl_ciphers is a colon-separated list of SSL ciphers;
  • ssl_password is a password for decrypting SSL private key;
  • ssl_password_file is a SSL file with key for decrypting SSL private key.

Closes #35

@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch 17 times, most recently from 7f4b1f4 to c2fe153 Compare November 8, 2024 13:42
@themilchenko themilchenko marked this pull request as ready for review November 8, 2024 13:47
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from c2fe153 to 47576bf Compare November 8, 2024 13:52
Copy link
Contributor

@oleg-jukovec oleg-jukovec left a comment

Choose a reason for hiding this comment

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

Thank you. Overall everything looks good, but there are a few comments.

README.md Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/sslsocket.lua Outdated Show resolved Hide resolved
http/sslsocket.lua Outdated Show resolved Hide resolved
http/server.lua Show resolved Hide resolved
test/ssl_data/generate.sh Show resolved Hide resolved
test/ssl_data/generate.sh Show resolved Hide resolved
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from 47576bf to 0d56b8b Compare November 11, 2024 07:51
README.md Outdated Show resolved Hide resolved
http/server.lua Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch 2 times, most recently from bcac6a5 to 2291731 Compare November 11, 2024 11:46
CHANGELOG.md Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from 2291731 to 4163eb2 Compare November 11, 2024 12:57
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from 4163eb2 to c9d569b Compare November 11, 2024 13:27
http/server.lua Outdated
Comment on lines 1300 to 1302
if not sslsocket_supported then
error("ssl socket is not supported")
end
Copy link
Contributor

Choose a reason for hiding this comment

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

Please, add the check into validate_ssl_opts too or move it since it is something about validation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Moved to validate section.

http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from c9d569b to 64dce9b Compare November 11, 2024 14:12
http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
Copy link
Contributor

@oleg-jukovec oleg-jukovec left a comment

Choose a reason for hiding this comment

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

Thank you, just a few non-critical renames left.

@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from 64dce9b to 2923118 Compare November 11, 2024 14:18
Copy link
Contributor

@DerekBum DerekBum left a comment

Choose a reason for hiding this comment

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

Thanks for the patch, see small comments below. Most of them are one repeated nit about code style (function(blah-blah) instead of function (blah-blah)). It is a small issue, but nowhere in this repo there is an extra space.

http/server.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
test/helpers.lua Outdated Show resolved Hide resolved
http/server.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_test.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_test.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_test.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_test.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_validate_test.lua Outdated Show resolved Hide resolved
test/integration/http_tls_enabled_validate_test.lua Outdated Show resolved Hide resolved
It wasn't SSL support. After the patch it was added several options to
configure SSL, use one of them to enable it:

  * `ssl_cert_file` is a path to the SSL cert file;
  * `ssl_key_file` is a path to the SSL key file;
  * `ssl_ca_file` is a path to the SSL CA file;
  * `ssl_ciphers` is a colon-separated list of SSL ciphers;
  * `ssl_password` is a password for decrypting SSL private key;
  * `ssl_password_file` is a SSL file with key for decrypting SSL private key.

Closes #35
There was errors with SSL options for several versions of Tarantool.

After the patch building of Tarantool was changed on dynamic one in CI.
@themilchenko themilchenko force-pushed the themilchenko/gh-35-add-ssl-support branch from 2923118 to 221e9f0 Compare November 11, 2024 14:57
@themilchenko themilchenko merged commit 9e3650b into master Nov 11, 2024
34 checks passed
@themilchenko themilchenko deleted the themilchenko/gh-35-add-ssl-support branch November 11, 2024 15:14
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.

api: add SSL support
3 participants