-
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
Changes from 4 commits
ce518c3
a89ce73
a9296fc
546757a
859c2f9
4197544
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| 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.getRootCaClientPollingInterval(); | ||
| 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(", ")); | ||
| } | ||
| } |
| 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)); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes I meant the same. Thanks for updating it. |
||
| 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()); | ||
| } | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.
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.
@Galsza , the client -> certificate change is missed in this SecurityConfig.java .
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.
@ChenSammi thanks I've addressed it now
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.
Okay, let's wait for the CI to pass.