letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore canceled IsSafeDomain calls. (#3730) 

Fixes #3681.
This commit is contained in:
Jacob Hoffman-Andrews 2018-05-23 12:50:30 -07:00 committed by Roland Bracewell Shoemaker
parent dbcb16543e
commit 5ad14170fb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
va/gsb.go
View File

@ -6,6 +6,7 @@ import (
safebrowsingv4 "github.com/google/safebrowsing"
"golang.org/x/net/context"
"github.com/letsencrypt/boulder/canceled"
bgrpc "github.com/letsencrypt/boulder/grpc"
vaPB "github.com/letsencrypt/boulder/va/proto"
)
@ -48,6 +49,12 @@ func (va *ValidationAuthorityImpl) isSafeDomain(ctx context.Context, domain stri
}
list, err := va.safeBrowsing.IsListed(ctx, domain)
if canceled.Is(err) {
// Sometimes an IsListed request will be canceled because the main
// validation failed, causing the parent context to be canceled.
stats.Inc("IsSafeDomain.Canceled", 1)
return true
}
if err != nil {
stats.Inc("IsSafeDomain.Errors", 1)
// In the event of an error checking the GSB status we allow the domain in