This repository was archived by the owner on Dec 1, 2025. It is now read-only.
Added OCSP worker to retrieve certificate status #286
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package ocspStatusWorker | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "io/ioutil" | ||
| "net/http" | ||
| "crypto/x509" | ||
|
|
||
| "github.com/mozilla/tls-observatory/logger" | ||
| "github.com/mozilla/tls-observatory/worker" | ||
| "golang.org/x/crypto/ocsp" | ||
| "bytes" | ||
| "crypto" | ||
| "time" | ||
| "encoding/base64" | ||
| ) | ||
|
|
||
| var workerName = "ocspStatusWorker" | ||
| var workerDesc = `Determines a certificate's status via OCSP'` | ||
|
|
||
| var log = logger.GetLogger() | ||
|
|
||
| func init() { | ||
| worker.RegisterWorker(workerName, worker.Info{Runner: new(ocspStatusWorker), Description: workerDesc}) | ||
| } | ||
|
|
||
| type ocspStatusWorker struct { | ||
| status OCSPStatus | ||
| } | ||
|
|
||
| type OCSPStatus struct { | ||
| Status int `json:"status"` | ||
| RevokedAt time.Time `json:"revoked_at"` | ||
|
|
||
| } | ||
|
|
||
| type params struct { | ||
| } | ||
|
|
||
| func (w ocspStatusWorker) Run(in worker.Input, resChan chan worker.Result) { | ||
| res := worker.Result{WorkerName: workerName, Success:false} | ||
|
|
||
| rawCert, _ := base64.StdEncoding.DecodeString(in.CertificateChain.Certs[0]) | ||
| certificate, _ := x509.ParseCertificate(rawCert) | ||
|
Contributor
There was a problem hiding this comment. the end entity is already parsed in |
||
| rawIssuerCert, _ := base64.StdEncoding.DecodeString(in.CertificateChain.Certs[1]) | ||
| issuerCertificate, _ := x509.ParseCertificate(rawIssuerCert) | ||
|
Contributor
There was a problem hiding this comment. You should check for errors here. It might also be worthwhile to make sure the issuer is the right one (that it sign the end-entity) because ordering isn't always guaranteed. You can use CheckSignatureFrom from the x509 package for this. |
||
|
|
||
| opts := &ocsp.RequestOptions{Hash: crypto.SHA256} | ||
| req, err := ocsp.CreateRequest(certificate, issuerCertificate, opts) | ||
| if err != nil { | ||
| res.Errors = append(res.Errors, err.Error()) | ||
|
Contributor
There was a problem hiding this comment. errors need to be inserted into the response channel, otherwise they will be dropped. Something like this: func (w runner) error(res chan worker.Result, messageFormat string, args ...interface{}) {
out, _ := json.Marshal(fmt.Sprintf(messageFormat, args...))
res <- worker.Result{
Success: false,
WorkerName: workerName,
Result: out,
}
}and use it as follows: if err != nil {
w.error(res, "there was an error: %v", err)
return
} |
||
| return | ||
| } | ||
|
|
||
| httpResponse, err := http.Post(certificate.OCSPServer[0], "application/ocsp-request", bytes.NewReader(req)) | ||
| if err != nil { | ||
| res.Errors = append(res.Errors, err.Error()) | ||
| return | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. add a |
||
| output, err := ioutil.ReadAll(httpResponse.Body) | ||
| if err != nil { | ||
| res.Errors = append(res.Errors, err.Error()) | ||
| return | ||
| } | ||
|
|
||
| OCSPResponse, err := ocsp.ParseResponse(output, issuerCertificate) | ||
| if err != nil { | ||
| res.Errors = append(res.Errors, err.Error()) | ||
| return | ||
| } | ||
|
|
||
| status := OCSPStatus{ Status:OCSPResponse.Status, RevokedAt:OCSPResponse.RevokedAt } | ||
|
|
||
| out, _ := json.Marshal(status) | ||
|
Contributor
There was a problem hiding this comment. don't ignore errors, you never know what the OCSP response will contain |
||
|
|
||
| res.Success = true | ||
| res.Result = out | ||
|
|
||
| resChan <- res | ||
| } | ||
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.
nit: remove "Worker" from the name, it's already under /worker/