Skip to content

scan: check for revocation in PKI ChainValidation #219

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
kisom merged 1 commit into from
May 26, 2015
+10 −12
Merged

scan: check for revocation in PKI ChainValidation #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions scan/pki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"bytes"
"crypto/x509"
"fmt"
"net"
"time"

"github.com/cloudflare/cf-tls/tls"
"github.com/cloudflare/cfssl/helpers"
"github.com/cloudflare/cfssl/revoke"
)

// PKI contains scanners for the Public Key Infrastructure.
Expand Down Expand Up @@ -89,20 +89,20 @@ func chainValidation(host string) (grade Grade, output Output, err error) {
return
}

h, _, err := net.SplitHostPort(host)
if err != nil {
return
}

if err = chain[0].VerifyHostname(h); err != nil {
return
}

var warnings []string

for i := 0; i < len(chain)-1; i++ {
cert, parent := chain[i], chain[i+1]

revoked, ok := revoke.VerifyCertificate(cert)
if !ok {
warnings = append(warnings, fmt.Sprintf("couldn't check if %s is revoked", cert.Subject.CommonName))
}
if revoked {
err = fmt.Errorf("%s is revoked", cert.Subject.CommonName)
return
}

if !parent.IsCA {
err = fmt.Errorf("%s is not a CA", parent.Subject.CommonName)
return
Expand All @@ -117,8 +117,6 @@ func chainValidation(host string) (grade Grade, output Output, err error) {
return
}

// TODO: Check CRL and OCSP revocation.

switch cert.SignatureAlgorithm {
case x509.ECDSAWithSHA1:
warnings = append(warnings, fmt.Sprintf("%s is signed by ECDSAWithSHA1", cert.Subject.CommonName))
Expand Down