Fixes #17332: At relay install time, if the domain is not defined the server certificate can not be issued #2949
Conversation
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
peckpeck
requested changes
May 5, 2020
| @@ -74,7 +74,8 @@ done | |||
| # Generate certificates if needed | |||
| if [ ! -f /opt/rudder/etc/ssl/rudder.crt ] || [ ! -f /opt/rudder/etc/ssl/rudder.key ]; then | |||
| echo -n "INFO: No usable SSL certificate detected for Rudder relay HTTPS support, generating one automatically..." | |||
| SUBJALTNAME=DNS:$(hostname --fqdn) openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=$(hostname --fqdn)/emailAddress=root@$(hostname --fqdn)/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
| NAME=$(hostname -fqdn || hostname) | |||
There was a problem hiding this comment.
doesnt hostname --fqdn output something when there is an error ?
| @@ -74,7 +74,8 @@ done | |||
| # Generate certificates if needed | |||
| if [ ! -f /opt/rudder/etc/ssl/rudder.crt ] || [ ! -f /opt/rudder/etc/ssl/rudder.key ]; then | |||
| echo -n "INFO: No usable SSL certificate detected for Rudder relay HTTPS support, generating one automatically..." | |||
| SUBJALTNAME=DNS:$(hostname --fqdn) openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=$(hostname --fqdn)/emailAddress=root@$(hostname --fqdn)/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
| NAME=$(hostname -fqdn || hostname) | |||
| SUBJALTNAME=DNS:$MACHINE_NAME openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=$MACHINE_NAME/emailAddress=root@$MACHINE_NAME/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
There was a problem hiding this comment.
You named the variable NAME, not MACHINE_NAME
There was a problem hiding this comment.
Please use ${} syntax for variables
|
PR updated with a new commit |
peckpeck
requested changes
May 5, 2020
| @@ -74,7 +74,8 @@ done | |||
| # Generate certificates if needed | |||
| if [ ! -f /opt/rudder/etc/ssl/rudder.crt ] || [ ! -f /opt/rudder/etc/ssl/rudder.key ]; then | |||
| echo -n "INFO: No usable SSL certificate detected for Rudder relay HTTPS support, generating one automatically..." | |||
| SUBJALTNAME=DNS:$(hostname --fqdn) openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=$(hostname --fqdn)/emailAddress=root@$(hostname --fqdn)/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
| MACHINE_NAME=$(hostname --fqdn 2>/dev/null || hostname) | |||
There was a problem hiding this comment.
I was thinking about non empty stdout for hostname errors
| @@ -74,7 +74,8 @@ done | |||
| # Generate certificates if needed | |||
| if [ ! -f /opt/rudder/etc/ssl/rudder.crt ] || [ ! -f /opt/rudder/etc/ssl/rudder.key ]; then | |||
| echo -n "INFO: No usable SSL certificate detected for Rudder relay HTTPS support, generating one automatically..." | |||
| SUBJALTNAME=DNS:$(hostname --fqdn) openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=$(hostname --fqdn)/emailAddress=root@$(hostname --fqdn)/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
| MACHINE_NAME=$(hostname --fqdn 2>/dev/null || hostname) | |||
| SUBJALTNAME=DNS:$MACHINE_NAME openssl req -new -x509 -newkey rsa:2048 -subj "/C=FR/ST=France/L=Paris/CN=${MACHINE_NAME}/emailAddress=root@${MACHINE_NAME}/" -keyout /opt/rudder/etc/ssl/rudder.key -out /opt/rudder/etc/ssl/rudder.crt -days 1460 -nodes -sha256 -config /opt/rudder/etc/ssl/openssl.cnf -extensions server_cert >/dev/null | |||
There was a problem hiding this comment.
please use ${} syntax for variables
|
PR updated with a new commit |
peckpeck
approved these changes
May 7, 2020
|
This PR is not mergeable to upper versions. |
|
OK, squash merging this PR |
… server certificate can not be issued
fanf
force-pushed
the
bug_17332/at_relay_install_time_if_the_domain_is_not_defined_the_server_certificate_can_not_be_issued
branch
from
400e803
to
1a7bff1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://issues.rudder.io/issues/17332