-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reworked Certificate checking to be more flexible and streamlined
- Loading branch information
Showing
12 changed files
with
436 additions
and
358 deletions.
There are no files selected for viewing
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
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
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
136 changes: 136 additions & 0 deletions
136
peppol-commons/src/main/java/com/helger/peppol/utils/PeppolCAChecker.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /* | ||
| * Copyright (C) 2015-2024 Philip Helger | ||
| * philip[at]helger[dot]com | ||
| * | ||
| * Licensed 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 com.helger.peppol.utils; | ||
|
|
||
| import java.security.cert.X509Certificate; | ||
| import java.time.OffsetDateTime; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import javax.annotation.Nullable; | ||
|
|
||
| import com.helger.commons.ValueEnforcer; | ||
| import com.helger.commons.datetime.PDTFactory; | ||
| import com.helger.commons.state.EChange; | ||
| import com.helger.commons.state.ETriState; | ||
|
|
||
| /** | ||
| * This is a specific helper class to check the validity of Peppol certificates | ||
| * for a specific PA. See {@link PeppolCertificateChecker} for predefined | ||
| * instances of this class. | ||
| * | ||
| * @author Philip Helger | ||
| * @since 9.6.0 | ||
| */ | ||
| public final class PeppolCAChecker | ||
| { | ||
| private final TrustedCACertificates m_aTrustedCAs = new TrustedCACertificates (); | ||
| private final PeppolRevocationCache m_aRevocationCache; | ||
|
|
||
| /** | ||
| * Constructor | ||
| * | ||
| * @param aCACerts | ||
| * The trusted CA certificates to be used. May neither be | ||
| * <code>null</code> nor empty. | ||
| */ | ||
| public PeppolCAChecker (@Nonnull final X509Certificate... aCACerts) | ||
| { | ||
| ValueEnforcer.notNullNoNullValue (aCACerts, "CACerts"); | ||
| for (final X509Certificate aCACert : aCACerts) | ||
| m_aTrustedCAs.addTrustedCACertificate (aCACert); | ||
| // The cache always uses "now" as the checking date and time | ||
| m_aRevocationCache = new PeppolRevocationCache (aCert -> new RevocationCheckBuilder ().certificate (aCert) | ||
| .validCAs (aCACerts) | ||
| .checkMode (CertificateRevocationCheckerDefaults.getRevocationCheckMode ()) | ||
| .build (), | ||
| CertificateRevocationCheckerDefaults.DEFAULT_REVOCATION_CHECK_CACHING_DURATION); | ||
| } | ||
|
|
||
| /** | ||
| * Check if the provided certificate is a valid Peppol certificate according | ||
| * to the configured CA. | ||
| * | ||
| * @param aCert | ||
| * The certificate to be checked. May be <code>null</code>. | ||
| * @return {@link EPeppolCertificateCheckResult} and never <code>null</code>. | ||
| */ | ||
| @Nonnull | ||
| public EPeppolCertificateCheckResult checkCertificate (@Nullable final X509Certificate aCert) | ||
| { | ||
| return checkCertificate (aCert, PDTFactory.getCurrentOffsetDateTime ()); | ||
| } | ||
|
|
||
| /** | ||
| * Check if the provided certificate is a valid Peppol certificate according | ||
| * to the configured CA. | ||
| * | ||
| * @param aCert | ||
| * The certificate to be checked. May be <code>null</code>. | ||
| * @param aCheckDT | ||
| * The check date and time to use. May be <code>null</code> which means | ||
| * "now". | ||
| * @return {@link EPeppolCertificateCheckResult} and never <code>null</code>. | ||
| */ | ||
| @Nonnull | ||
| public EPeppolCertificateCheckResult checkCertificate (@Nullable final X509Certificate aCert, | ||
| @Nullable final OffsetDateTime aCheckDT) | ||
| { | ||
| return checkCertificate (aCert, aCheckDT, ETriState.UNDEFINED, null); | ||
| } | ||
|
|
||
| /** | ||
| * Check if the provided certificate is a valid Peppol certificate according | ||
| * to the configured CA. | ||
| * | ||
| * @param aCert | ||
| * The certificate to be checked. May be <code>null</code>. | ||
| * @param aCheckDT | ||
| * The check date and time to use. May be <code>null</code> which means | ||
| * "now". | ||
| * @param eCacheRevocationCheckResult | ||
| * Define whether to cache the revocation check results or not. Use | ||
| * {@link ETriState#UNDEFINED} to solely use the default. | ||
| * @param eCheckMode | ||
| * Possibility to override the revocation checking mode for each check. | ||
| * May be <code>null</code> to use the global state from | ||
| * {@link CertificateRevocationCheckerDefaults#getRevocationCheckMode()}. | ||
| * @return {@link EPeppolCertificateCheckResult} and never <code>null</code>. | ||
| */ | ||
| @Nonnull | ||
| public EPeppolCertificateCheckResult checkCertificate (@Nullable final X509Certificate aCert, | ||
| @Nullable final OffsetDateTime aCheckDT, | ||
| @Nonnull final ETriState eCacheRevocationCheckResult, | ||
| @Nullable final ERevocationCheckMode eCheckMode) | ||
| { | ||
| final boolean bUseRevocationCache = eCacheRevocationCheckResult.isUndefined () ? CertificateRevocationCheckerDefaults.isCacheRevocationCheckResults () | ||
| : eCacheRevocationCheckResult.isTrue (); | ||
|
|
||
| return PeppolCertificateChecker.checkCertificate (m_aTrustedCAs.getAllTrustedCAIssuers (), | ||
| bUseRevocationCache && aCheckDT == null ? m_aRevocationCache | ||
| : null, | ||
| new RevocationCheckBuilder ().certificate (aCert) | ||
| .checkDate (aCheckDT) | ||
| .validCAs (m_aTrustedCAs.getAllTrustedCACertificates ()) | ||
| .checkMode (eCheckMode)); | ||
| } | ||
|
|
||
| @Nonnull | ||
| public EChange clearRevocationCache () | ||
| { | ||
| return m_aRevocationCache.clearCache (); | ||
| } | ||
| } |
Oops, something went wrong.