Skip to content

HDDS-7708. No check for certificate duration config scenarios. #4149

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

Merged
ChenSammi merged 4 commits into from
Jan 6, 2023
Merged

HDDS-7708. No check for certificate duration config scenarios. #4149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f2a979
HDDS-7708. No check for certificate duration config scenarios.
ashishkr200 Jan 6, 2023
afb46c0
Merge branch 'master' into HDDS-7708
ashishkumar50 Jan 6, 2023
516c9fc
HDDS-7708. No check for certificate duration config scenarios.
ashishkr200 Jan 6, 2023
68574c8
HDDS-7708. No check for certificate duration config scenarios.
ashishkr200 Jan 6, 2023
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
45 changes: 39 additions & 6 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/x509/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,7 @@ public SecurityConfig(ConfigurationSource configuration) {
HDDS_X509_RENEW_GRACE_DURATION_DEFAULT);
renewalGracePeriod = Duration.parse(renewalGraceDurationString);

if (maxCertDuration.compareTo(defaultCertDuration) < 0) {
LOG.error("Certificate duration {} should not be greater than Maximum " +
"Certificate duration {}", maxCertDuration, defaultCertDuration);
throw new IllegalArgumentException("Certificate duration should not be " +
"greater than maximum Certificate duration");
}
validateCertificateValidityConfig();

this.externalRootCaCert = this.configuration.get(
HDDS_X509_ROOTCA_CERTIFICATE_FILE,
Expand Down Expand Up @@ -228,6 +223,44 @@ public SecurityConfig(ConfigurationSource configuration) {
TimeUnit.MILLISECONDS);
}

/**
* Check for certificate validity configuration.
*/
private void validateCertificateValidityConfig() {
if (maxCertDuration.isNegative() || maxCertDuration.isZero()) {
String msg = "Property " + HDDS_X509_MAX_DURATION +
" should not be zero or negative";
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
if (defaultCertDuration.isNegative() || defaultCertDuration.isZero()) {
String msg = "Property " + HDDS_X509_DEFAULT_DURATION +
" should not be zero or negative";
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
if (renewalGracePeriod.isNegative() || renewalGracePeriod.isZero()) {
String msg = "Property " + HDDS_X509_RENEW_GRACE_DURATION +
" should not be zero or negative";
LOG.error(msg);
throw new IllegalArgumentException(msg);
}

if (maxCertDuration.compareTo(defaultCertDuration) < 0) {
String msg = "Property " + HDDS_X509_DEFAULT_DURATION +
" should not be greater than Property " + HDDS_X509_MAX_DURATION;
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
if (defaultCertDuration.compareTo(renewalGracePeriod) < 0) {
String msg = "Property " + HDDS_X509_RENEW_GRACE_DURATION +
" should not be greater than Property "
+ HDDS_X509_DEFAULT_DURATION;
LOG.error(msg);
throw new IllegalArgumentException(msg);
}
}

/**
* Returns the CRL Name.
*
Expand Down
3 changes: 3 additions & 0 deletions .../src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainerWithTLS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECURITY_SSL_KEYSTORE_RELOAD_INTERVAL;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_SECURITY_SSL_TRUSTSTORE_RELOAD_INTERVAL;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_X509_DEFAULT_DURATION;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_X509_RENEW_GRACE_DURATION;
import static org.apache.hadoop.hdds.HddsConfigKeys.OZONE_METADATA_DIRS;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.HDDS_DATANODE_DIR_KEY;
import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY;
Expand Down Expand Up @@ -131,9 +132,11 @@ public void setup() throws Exception {

conf.setBoolean(HddsConfigKeys.HDDS_GRPC_TLS_TEST_CERT, true);
conf.setInt(HDDS_KEY_LEN, 1024);

// certificate lives for 10s
conf.set(HDDS_X509_DEFAULT_DURATION,
Duration.ofMillis(certLifetime).toString());
conf.set(HDDS_X509_RENEW_GRACE_DURATION, "PT2S");
conf.set(HDDS_SECURITY_SSL_KEYSTORE_RELOAD_INTERVAL, "1s");
conf.set(HDDS_SECURITY_SSL_TRUSTSTORE_RELOAD_INTERVAL, "1s");

Expand Down