Comments

cmd/bad-key-revoker/main.go

@@ -370,7 +370,7 @@ func (bkr *badKeyRevoker) invoke(ctx context.Context) (bool, error) {
 		}
 	}
 
-	serials := make([]string, 0, len(unrevokedCerts))
+	serials := make([]string, 0)
 	for _, cert := range unrevokedCerts {
 		serials = append(serials, cert.Serial)
 	}

cmd/expiration-mailer/main.go

@@ -106,7 +106,7 @@ func (lim *limiter) check(address string) error {
 
 	lim.maybeBumpDay()
 	if lim.counts[address] >= lim.limit {
-		return errors.New("daily mail limit exceeded")
+		return errors.New("daily mail limit exceeded for this email address")
 	}
 	return nil
 }

policy/pa.go

@@ -345,7 +345,9 @@ func ValidEmail(address string) error {
 		return berrors.InvalidEmailError("contact email has invalid domain: %s", err)
 	}
 	if forbiddenMailDomains[domain] {
-		return berrors.InvalidEmailError("contact email has forbidden domain")
+		// We're okay including the domain in the error message here because this
+		// case occurs only for a small block-list of domains listed above.
+		return berrors.InvalidEmailError("contact email has forbidden domain %q", domain)
 	}
 	return nil
 }

policy/pa_test.go

@@ -479,7 +479,7 @@ func TestValidEmailError(t *testing.T) {
 	test.AssertEquals(t, err.Error(), "unable to parse email address")
 
 	err = ValidEmail("[email protected]")
-	test.AssertEquals(t, err.Error(), "contact email has forbidden domain")
+	test.AssertEquals(t, err.Error(), "contact email has forbidden domain \"example.com\"")
 
 	err = ValidEmail("[email protected]")
 	test.AssertEquals(t, err.Error(), "contact email has invalid domain: Domain name contains an invalid character")

test/integration/errors_test.go

@@ -96,7 +96,7 @@ func TestAccountEmailError(t *testing.T) {
 			name:               "forbidden contact domain",
 			contacts:           []string{"mailto:[email protected]", "mailto:[email protected]"},
 			expectedProbType:   "urn:ietf:params:acme:error:invalidContact",
-			expectedProbDetail: "contact email has forbidden domain",
+			expectedProbDetail: "contact email has forbidden domain \"example.com\"",
 		},
 		{
 			name:               "contact domain invalid TLD",