-
Notifications
You must be signed in to change notification settings - Fork 588
HDDS-8591. Create scheduler to check for new root ca certificates #4961
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
Merged
ChenSammi
merged 6 commits into
apache:master
from
Galsza:HDDS-8591_root_ca_rotation_polling
Jul 6, 2023
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ce518c3
HDDS-8591 Create root ca rotation poller
Galsza a89ce73
HDDS-8591 Replace the phrase interval instead of frequency
Galsza a9296fc
HDDS-8591 Replace the phrase interval instead of frequency
Galsza 546757a
HDDS-8591 Address renew comments
Galsza 859c2f9
HDDS-8591 Fix missing client -> certificate rename
Galsza 4197544
trigger CI
ChenSammi 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 hidden or 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 hidden or 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 hidden or 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
143 changes: 143 additions & 0 deletions
143
...in/java/org/apache/hadoop/hdds/security/x509/certificate/client/RootCaRotationPoller.java
This file contains hidden or 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,143 @@ | ||
| /* | ||
| * 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 | ||
| * <p> | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * 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. | ||
| */ | ||
| package org.apache.hadoop.hdds.security.x509.certificate.client; | ||
|
|
||
| import com.google.common.util.concurrent.ThreadFactoryBuilder; | ||
| import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB; | ||
| import org.apache.hadoop.hdds.security.SecurityConfig; | ||
| import org.apache.hadoop.ozone.OzoneSecurityUtil; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.io.IOException; | ||
| import java.math.BigInteger; | ||
| import java.security.cert.X509Certificate; | ||
| import java.time.Duration; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Poller mechanism for Root Ca Rotation for clients. | ||
| */ | ||
| public class RootCaRotationPoller implements Runnable, Closeable { | ||
|
|
||
| private static final Logger LOG = | ||
| LoggerFactory.getLogger(RootCaRotationPoller.class); | ||
| private final List<Function<List<X509Certificate>, CompletableFuture<Void>>> | ||
| rootCARotationProcessors; | ||
| private final ScheduledExecutorService poller; | ||
| private final Duration pollingInterval; | ||
| private Set<X509Certificate> knownRootCerts; | ||
| private final SCMSecurityProtocolClientSideTranslatorPB scmSecureClient; | ||
|
|
||
| public RootCaRotationPoller(SecurityConfig securityConfig, | ||
| Set<X509Certificate> initiallyKnownRootCaCerts, | ||
| SCMSecurityProtocolClientSideTranslatorPB scmSecureClient) { | ||
| this.scmSecureClient = scmSecureClient; | ||
| this.knownRootCerts = initiallyKnownRootCaCerts; | ||
| poller = Executors.newScheduledThreadPool(1, | ||
| new ThreadFactoryBuilder().setNameFormat( | ||
| this.getClass().getSimpleName()) | ||
| .setDaemon(true).build()); | ||
| pollingInterval = securityConfig.getRootCaCertificatePollingInterval(); | ||
| rootCARotationProcessors = new ArrayList<>(); | ||
| } | ||
|
|
||
| private void pollRootCas() { | ||
| try { | ||
| List<String> pemEncodedRootCaList = | ||
| scmSecureClient.getAllRootCaCertificates(); | ||
| List<X509Certificate> rootCAsFromSCM = | ||
| OzoneSecurityUtil.convertToX509(pemEncodedRootCaList); | ||
| List<X509Certificate> scmCertsWithoutKnownCerts | ||
| = new ArrayList<>(rootCAsFromSCM); | ||
| scmCertsWithoutKnownCerts.removeAll(knownRootCerts); | ||
| if (scmCertsWithoutKnownCerts.isEmpty()) { | ||
| return; | ||
| } | ||
| LOG.info("Some root CAs are not known to the client out of the root " + | ||
| "CAs known to the SCMs. Root CA Cert ids known to the client: " + | ||
| getPrintableCertIds(knownRootCerts) + ". Root CA Cert ids from " + | ||
| "SCM not known by the client: " + | ||
| getPrintableCertIds(scmCertsWithoutKnownCerts)); | ||
|
|
||
| CompletableFuture<Void> allRootCAProcessorFutures = | ||
| CompletableFuture.allOf(rootCARotationProcessors.stream() | ||
| .map(c -> c.apply(rootCAsFromSCM)) | ||
| .toArray(CompletableFuture[]::new)); | ||
|
|
||
| allRootCAProcessorFutures.whenComplete((unused, throwable) -> { | ||
| if (throwable == null) { | ||
| knownRootCerts = new HashSet<>(rootCAsFromSCM); | ||
| } | ||
| }); | ||
| } catch (IOException e) { | ||
| LOG.error("Error while trying to poll root ca certificate", e); | ||
| } | ||
| } | ||
|
|
||
| public void addRootCARotationProcessor( | ||
| Function<List<X509Certificate>, CompletableFuture<Void>> processor) { | ||
| rootCARotationProcessors.add(processor); | ||
| } | ||
|
|
||
| @Override | ||
| public void run() { | ||
| poller.scheduleAtFixedRate(this::pollRootCas, 0, | ||
| pollingInterval.getSeconds(), TimeUnit.SECONDS); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| executorServiceShutdownGraceful(poller); | ||
| } | ||
|
|
||
| private void executorServiceShutdownGraceful(ExecutorService executor) { | ||
| executor.shutdown(); | ||
| try { | ||
| if (!executor.awaitTermination(5, TimeUnit.SECONDS)) { | ||
| executor.shutdownNow(); | ||
| } | ||
| if (!executor.awaitTermination(5, TimeUnit.SECONDS)) { | ||
| LOG.warn("{} couldn't be shut down gracefully", | ||
| getClass().getSimpleName()); | ||
| } | ||
| } catch (InterruptedException e) { | ||
| LOG.warn("{} couldn't be stopped gracefully", getClass().getSimpleName()); | ||
| Thread.currentThread().interrupt(); | ||
| } | ||
| } | ||
|
|
||
| private String getPrintableCertIds(Collection<X509Certificate> certs) { | ||
| return certs.stream() | ||
| .map(X509Certificate::getSerialNumber) | ||
| .map(BigInteger::toString) | ||
| .collect(Collectors.joining(", ")); | ||
| } | ||
| } |
130 changes: 130 additions & 0 deletions
130
...java/org/apache/hadoop/hdds/security/x509/certificate/utils/TestRootCaRotationPoller.java
This file contains hidden or 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,130 @@ | ||
| /* | ||
| * 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. | ||
| * | ||
| */ | ||
| package org.apache.hadoop.hdds.security.x509.certificate.utils; | ||
|
|
||
| import org.apache.hadoop.hdds.conf.OzoneConfiguration; | ||
| import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB; | ||
| import org.apache.hadoop.hdds.security.SecurityConfig; | ||
| import org.apache.hadoop.hdds.security.x509.certificate.client.RootCaRotationPoller; | ||
| import org.apache.hadoop.security.ssl.KeyStoreTestUtil; | ||
| import org.apache.ozone.test.GenericTestUtils; | ||
| import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.mockito.Mock; | ||
| import org.mockito.Mockito; | ||
| import org.mockito.MockitoAnnotations; | ||
|
|
||
| import java.security.KeyPair; | ||
| import java.security.cert.X509Certificate; | ||
| import java.time.Duration; | ||
| import java.time.LocalDateTime; | ||
| import java.util.ArrayList; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.TimeoutException; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
|
|
||
| import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_X509_ROOTCA_CERTIFICATE_POLLING_INTERVAL; | ||
|
|
||
| /** | ||
| * Test for Root Ca Rotation polling mechanism on client side. | ||
| */ | ||
| public class TestRootCaRotationPoller { | ||
|
|
||
| private SecurityConfig secConf; | ||
|
|
||
| @Mock | ||
| private SCMSecurityProtocolClientSideTranslatorPB scmSecurityClient; | ||
|
|
||
| @BeforeEach | ||
| public void setup() { | ||
| MockitoAnnotations.openMocks(this); | ||
| OzoneConfiguration conf = new OzoneConfiguration(); | ||
| conf.set(HDDS_X509_ROOTCA_CERTIFICATE_POLLING_INTERVAL, "PT1s"); | ||
| secConf = new SecurityConfig(conf); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPollerDoesNotInvokeRootCaProcessor() throws Exception { | ||
| X509Certificate knownCert = generateX509Cert( | ||
| LocalDateTime.now(), Duration.ofSeconds(50)); | ||
| HashSet<X509Certificate> knownCerts = new HashSet<>(); | ||
| knownCerts.add(knownCert); | ||
| List<String> certsFromScm = new ArrayList<>(); | ||
| certsFromScm.add(CertificateCodec.getPEMEncodedString(knownCert)); | ||
| RootCaRotationPoller poller = new RootCaRotationPoller(secConf, | ||
| knownCerts, scmSecurityClient); | ||
|
|
||
| Mockito.when(scmSecurityClient.getAllRootCaCertificates()) | ||
| .thenReturn(certsFromScm); | ||
| AtomicBoolean atomicBoolean = new AtomicBoolean(); | ||
| atomicBoolean.set(false); | ||
| poller.addRootCARotationProcessor( | ||
| certificates -> CompletableFuture.supplyAsync(() -> { | ||
| atomicBoolean.set(true); | ||
| Assertions.assertEquals(certificates.size(), 2); | ||
| return null; | ||
| })); | ||
| poller.run(); | ||
| Assertions.assertThrows(TimeoutException.class, () -> | ||
| GenericTestUtils.waitFor(atomicBoolean::get, 50, 5000)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testPollerInvokesRootCaProcessors() throws Exception { | ||
| X509Certificate knownCert = generateX509Cert( | ||
| LocalDateTime.now(), Duration.ofSeconds(50)); | ||
| X509Certificate newRootCa = generateX509Cert( | ||
| LocalDateTime.now(), Duration.ofSeconds(50)); | ||
| HashSet<X509Certificate> knownCerts = new HashSet<>(); | ||
| knownCerts.add(knownCert); | ||
| List<String> certsFromScm = new ArrayList<>(); | ||
| certsFromScm.add(CertificateCodec.getPEMEncodedString(knownCert)); | ||
| certsFromScm.add(CertificateCodec.getPEMEncodedString(newRootCa)); | ||
| RootCaRotationPoller poller = new RootCaRotationPoller(secConf, | ||
| knownCerts, scmSecurityClient); | ||
| poller.run(); | ||
| Mockito.when(scmSecurityClient.getAllRootCaCertificates()) | ||
| .thenReturn(certsFromScm); | ||
| AtomicBoolean atomicBoolean = new AtomicBoolean(); | ||
| atomicBoolean.set(false); | ||
| poller.addRootCARotationProcessor( | ||
| certificates -> CompletableFuture.supplyAsync(() -> { | ||
| atomicBoolean.set(true); | ||
| Assertions.assertEquals(certificates.size(), 2); | ||
| return null; | ||
| })); | ||
| GenericTestUtils.waitFor(atomicBoolean::get, 50, 5000); | ||
| } | ||
|
|
||
| private X509Certificate generateX509Cert( | ||
| LocalDateTime startDate, Duration certLifetime) throws Exception { | ||
| KeyPair keyPair = KeyStoreTestUtil.generateKeyPair("RSA"); | ||
| LocalDateTime start = startDate == null ? LocalDateTime.now() : startDate; | ||
| LocalDateTime end = start.plus(certLifetime); | ||
| return new JcaX509CertificateConverter().getCertificate( | ||
| SelfSignedCertificate.newBuilder().setBeginDate(start) | ||
| .setEndDate(end).setClusterID("cluster").setKey(keyPair) | ||
| .setSubject("localhost").setConfiguration(secConf).setScmID("test") | ||
| .build()); | ||
| } | ||
| } | ||
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 you have small test by just adding knowCert to ensure both cases are fine.
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.
I'm not sure what you meant by this, but I have refined the first test case to use the knownCert instead of not using certs at all. I hope this fixes it.
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.
Yes I meant the same. Thanks for updating it.