-
Notifications
You must be signed in to change notification settings - Fork 135
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
OCSP responder to serve status check for itself using latest CRL #4504
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
b9a9eb0
Modify init order for OCSP subsystem
fmarco76 57df77e
Add callback for CRL validation at application level
fmarco76 e6a1e0c
Make crl check for connection optional
fmarco76 7ad255e
Add crl check for OCSP acting as server
fmarco76 d54adc9
Move callback reference from CMS to CMSEngine
fmarco76 1615339
OCSP default CRL check and CA cert validation
fmarco76 2b31525
Rename checkSubsystemConnection to validateConnCertWithCRL
fmarco76 4366f72
Use AKI/SKI to match peer certificate with CA CRL
fmarco76 584cc11
Add comment for the option ocsp.store.ldapStore.validateConnCertWithCRL
fmarco76 3513512
Modify local variable names
fmarco76 47f268c
Update log message for revoked certificate
fmarco76 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
108 changes: 108 additions & 0 deletions
108
base/ocsp/src/main/java/com/netscape/cms/ocsp/CRLLdapValidator.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,108 @@ | ||
| // --- BEGIN COPYRIGHT BLOCK --- | ||
| // This program is free software; you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation; version 2 of the License. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License along | ||
| // with this program; if not, write to the Free Software Foundation, Inc., | ||
| // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| // | ||
| // (C) 2023 Red Hat, Inc. | ||
| // All rights reserved. | ||
| // --- END COPYRIGHT BLOCK --- | ||
| package com.netscape.cms.ocsp; | ||
|
|
||
| import java.io.IOException; | ||
| import java.security.cert.CertificateException; | ||
| import java.security.cert.X509CRLEntry; | ||
| import java.util.Arrays; | ||
| import java.util.Enumeration; | ||
|
|
||
| import org.mozilla.jss.crypto.X509Certificate; | ||
| import org.mozilla.jss.netscape.security.x509.AuthorityKeyIdentifierExtension; | ||
| import org.mozilla.jss.netscape.security.x509.KeyIdentifier; | ||
| import org.mozilla.jss.netscape.security.x509.PKIXExtensions; | ||
| import org.mozilla.jss.netscape.security.x509.SubjectKeyIdentifierExtension; | ||
| import org.mozilla.jss.netscape.security.x509.X509CRLImpl; | ||
| import org.mozilla.jss.netscape.security.x509.X509CertImpl; | ||
| import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; | ||
|
|
||
| import com.netscape.certsrv.base.EBaseException; | ||
| import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; | ||
|
|
||
| public class CRLLdapValidator implements SSLCertificateApprovalCallback { | ||
|
|
||
| public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(CRLLdapValidator.class); | ||
|
|
||
| private LDAPStore crlStore; | ||
|
|
||
|
|
||
|
|
||
| public CRLLdapValidator(LDAPStore crlStore) { | ||
| super(); | ||
| this.crlStore = crlStore; | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| public boolean approve(X509Certificate certificate, ValidityStatus currentStatus) { | ||
| logger.info("CRLLdapValidator: validate of peer's certificate for the connection " + certificate.getSubjectDN()); | ||
| ICRLIssuingPointRecord pt = null; | ||
| try { | ||
| X509CertImpl peerCert = new X509CertImpl(certificate.getEncoded()); | ||
| Enumeration<ICRLIssuingPointRecord> eCRL = crlStore.searchAllCRLIssuingPointRecord(-1); | ||
| AuthorityKeyIdentifierExtension peerAKIExt = (AuthorityKeyIdentifierExtension) peerCert.getExtension(PKIXExtensions.AuthorityKey_Id.toString()); | ||
| if(peerAKIExt == null) { | ||
| logger.error("CRLLdapValidator: the certificate has not Authority Key Identifier Extension. CRL verification cannot be done."); | ||
| return false; | ||
| } | ||
| while (eCRL.hasMoreElements() && pt == null) { | ||
| ICRLIssuingPointRecord tPt = eCRL.nextElement(); | ||
| logger.debug("CRLLdapValidator: CRL check issuer " + tPt.getId()); | ||
| X509CertImpl caCert = new X509CertImpl(tPt.getCACert()); | ||
| try { | ||
| SubjectKeyIdentifierExtension caAKIExt = (SubjectKeyIdentifierExtension) caCert.getExtension(PKIXExtensions.SubjectKey_Id.toString()); | ||
| if(caAKIExt == null) { | ||
| logger.error("CRLLdapValidator: signing certificate missing Subject Key Identifier. Skip CA " + caCert.getName()); | ||
| continue; | ||
| } | ||
|
|
||
| KeyIdentifier caSKIId = (KeyIdentifier) caAKIExt.get(SubjectKeyIdentifierExtension.KEY_ID); | ||
| KeyIdentifier peerAKIId = (KeyIdentifier) peerAKIExt.get(AuthorityKeyIdentifierExtension.KEY_ID); | ||
| if(Arrays.equals(caSKIId.getIdentifier(), peerAKIId.getIdentifier())) { | ||
| pt = tPt; | ||
| } | ||
| } catch (IOException e) { | ||
| logger.error("CRLLdapValidator: problem extracting key from SKI/AKI"); | ||
| } | ||
| } | ||
| } catch (EBaseException | CertificateException e) { | ||
| logger.error("CRLLdapValidator: problem find CRL issuing point. " + e.getMessage(), e); | ||
| return false; | ||
| } | ||
| if (pt == null) { | ||
| logger.error("CRLLdapValidator: CRL issuing point not found for " + certificate.getIssuerDN()); | ||
| return false; | ||
| } | ||
| try { | ||
| X509CRLImpl crl = new X509CRLImpl(pt.getCRL()); | ||
| X509CRLEntry crlentry = crl.getRevokedCertificate(certificate.getSerialNumber()); | ||
|
|
||
| if (crlentry == null) { | ||
| if (crlStore.isNotFoundGood()) { | ||
| return true; | ||
| } | ||
| } | ||
| } catch (Exception e) { | ||
| logger.error("CRLLdapValidator: crl check error. " + e.getMessage(), e); | ||
| } | ||
| logger.error("CRLLdapValidator: peer certificate not valid"); | ||
| return false; | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.
Oops, something went wrong.
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.
The option
ocsp.store.ldapStore.validateConnCertWithCRLenables the revocation verification of peer certificates using the CRL stored in the LDAP shared with the CA.When it is set to
true(default value), the peer certificate of all the outcome connections from the OCSP subsystem are verified with the CRL.If the option
auths.revocationChecking.enabledis also set totruethe peer certificate ot all the income connections to the OCSP subsystem are verified with the CRL.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.
How about put the info right here in the code where PROP_VALIDATE_CONNECTION_WITH_CRL = "validateConnCertWithCRL" is assigned? Comments in code are longer lasting and provide info others later. I will also be using it for the doc changes.