Skip to content

Commit 19b0acf

Browse files
Addressing comments
1 parent 6722e0e commit 19b0acf

File tree

7 files changed

+168
-146
lines changed

7 files changed

+168
-146
lines changed

ra/ra_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ func (dva *DummyValidationAuthority) PerformValidation(ctx context.Context, req
156156
return dva.PerformValidationRequestResultReturn, dva.PerformValidationRequestResultError
157157
}
158158

159-
func (dva *DummyValidationAuthority) ValidateChallenge(ctx context.Context, req *vapb.ValidationRequest, _ ...grpc.CallOption) (*vapb.ValidationResult, error) {
159+
func (dva *DummyValidationAuthority) DoDCV(ctx context.Context, req *vapb.DCVRequest, _ ...grpc.CallOption) (*vapb.ValidationResult, error) {
160160
return nil, status.Error(codes.Unimplemented, "not implemented")
161161
}
162162

va/proto/va.pb.go

Lines changed: 48 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

va/proto/va.proto

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,21 @@ option go_package = "github.com/letsencrypt/boulder/va/proto";
66
import "core/proto/core.proto";
77

88
service VA {
9+
// PerformValidation performs a local Domain Control Validation (DCV) and CAA
10+
// check for the provided challenge and dnsName. If called on the primary VA
11+
// and local validation passes, it will also perform DCV and CAA checks using
12+
// the configured remote VAs. The returned result will always contain a list
13+
// of validation records, even when it also contains a problem. This method is
14+
// not MPIC-compliant.
915
rpc PerformValidation(PerformValidationRequest) returns (ValidationResult) {}
10-
rpc ValidateChallenge(ValidationRequest) returns (ValidationResult) {}
16+
// DoDCV performs a local Domain Control Validation (DCV) for the provided
17+
// challenge. If called on the primary VA and local validation passes, it will
18+
// also perform an MPIC-compliant DCV using the configured remote VAs. The
19+
// method returns the validation result and an error if the validation failed.
20+
// The returned result will always contain a list of validation records, even
21+
// when it also contains a problem. This method does not check CAA records and
22+
// should not be used as a replacement for VA.PerformValidation.
23+
rpc DoDCV(DCVRequest) returns (ValidationResult) {}
1124
}
1225

1326
service CAA {
@@ -45,7 +58,7 @@ message ValidationResult {
4558
string rir = 4;
4659
}
4760

48-
message ValidationRequest {
61+
message DCVRequest {
4962
core.Identifier identifier = 1;
5063
core.Challenge challenge = 2;
5164
int64 regID = 3;

va/proto/va_grpc.pb.go

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

va/va.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,12 @@ func (va *ValidationAuthorityImpl) performLocalValidation(
654654
return records, nil
655655
}
656656

657-
// PerformValidation validates the challenge for the domain in the request.
658-
// The returned result will always contain a list of validation records, even
659-
// when it also contains a problem.
657+
// PerformValidation performs a local Domain Control Validation (DCV) and CAA
658+
// check for the provided challenge and dnsName. If called on the primary VA and
659+
// local validation passes, it will also perform DCV and CAA checks using the
660+
// configured remote VAs. The returned result will always contain a list of
661+
// validation records, even when it also contains a problem. This method is not
662+
// MPIC-compliant.
660663
func (va *ValidationAuthorityImpl) PerformValidation(ctx context.Context, req *vapb.PerformValidationRequest) (*vapb.ValidationResult, error) {
661664
if core.IsAnyNilOrZero(req, req.DnsName, req.Challenge, req.Authz, req.ExpectedKeyAuthorization) {
662665
return nil, berrors.InternalServerError("Incomplete validation request")

0 commit comments

Comments
 (0)