Remove logging of Request/ResponseNonce. (letsencrypt#3421)

jsha · cpu · commit c0ffa3d5d1ab · 2018-02-06T10:17:12.000-05:00
These take up a lot of space in the logs, and we almost never reference
them.
diff --git a/web/context.go b/web/context.go
@@ -11,18 +11,16 @@ import (
 )
 
 type RequestEvent struct {
-	RealIP        string    `json:",omitempty"`
-	Endpoint      string    `json:",omitempty"`
-	Method        string    `json:",omitempty"`
-	Errors        []string  `json:",omitempty"`
-	Requester     int64     `json:",omitempty"`
-	Contacts      *[]string `json:",omitempty"`
-	RequestNonce  string    `json:",omitempty"`
-	ResponseNonce string    `json:",omitempty"`
-	UserAgent     string    `json:",omitempty"`
-	Code          int
-	Payload       string                 `json:",omitempty"`
-	Extra         map[string]interface{} `json:",omitempty"`
+	RealIP    string    `json:",omitempty"`
+	Endpoint  string    `json:",omitempty"`
+	Method    string    `json:",omitempty"`
+	Errors    []string  `json:",omitempty"`
+	Requester int64     `json:",omitempty"`
+	Contacts  *[]string `json:",omitempty"`
+	UserAgent string    `json:",omitempty"`
+	Code      int
+	Payload   string                 `json:",omitempty"`
+	Extra     map[string]interface{} `json:",omitempty"`
 }
 
 func (e *RequestEvent) AddError(msg string, args ...interface{}) {
diff --git a/wfe/wfe.go b/wfe/wfe.go
@@ -160,7 +160,6 @@ func (wfe *WebFrontEndImpl) HandleFunc(mux *http.ServeMux, pattern string, h web
 			nonce, err := wfe.nonceService.Nonce()
 			if err == nil {
 				response.Header().Set("Replay-Nonce", nonce)
-				logEvent.ResponseNonce = nonce
 			} else {
 				logEvent.AddError("unable to make nonce: %s", err)
 			}
@@ -544,7 +543,6 @@ func (wfe *WebFrontEndImpl) verifyPOST(ctx context.Context, logEvent *web.Reques
 
 	// Check that the request has a known anti-replay nonce
 	nonce := parsedJws.Signatures[0].Header.Nonce
-	logEvent.RequestNonce = nonce
 	if len(nonce) == 0 {
 		wfe.stats.Inc("Errors.JWSMissingNonce", 1)
 		return nil, nil, reg, probs.BadNonce("JWS has no anti-replay nonce")
diff --git a/wfe2/verify.go b/wfe2/verify.go
@@ -159,16 +159,14 @@ func (wfe *WebFrontEndImpl) validPOSTRequest(request *http.Request) *probs.Probl
 }
 
 // validNonce checks a JWS' Nonce header to ensure it is one that the
-// nonceService knows about, otherwise a bad nonce problem is returned. The
-// provided logEvent is mutated to set the observed RequestNonce.
+// nonceService knows about, otherwise a bad nonce problem is returned.
 // NOTE: this function assumes the JWS has already been verified with the
 // correct public key.
-func (wfe *WebFrontEndImpl) validNonce(jws *jose.JSONWebSignature, logEvent *web.RequestEvent) *probs.ProblemDetails {
+func (wfe *WebFrontEndImpl) validNonce(jws *jose.JSONWebSignature) *probs.ProblemDetails {
 	// validNonce is called after validPOSTRequest() and parseJWS() which
 	// defend against the incorrect number of signatures.
 	header := jws.Signatures[0].Header
 	nonce := header.Nonce
-	logEvent.RequestNonce = nonce
 	if len(nonce) == 0 {
 		wfe.stats.joseErrorCount.With(prometheus.Labels{"type": "JWSMissingNonce"}).Inc()
 		return probs.BadNonce("JWS has no anti-replay nonce")
@@ -451,7 +449,7 @@ func (wfe *WebFrontEndImpl) validJWSForKey(
 	logEvent.Payload = string(payload)
 
 	// Check that the JWS contains a correct Nonce header
-	if prob := wfe.validNonce(jws, logEvent); prob != nil {
+	if prob := wfe.validNonce(jws); prob != nil {
 		return nil, prob
 	}
 
diff --git a/wfe2/verify_test.go b/wfe2/verify_test.go
@@ -575,7 +575,7 @@ func TestValidNonce(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.Name, func(t *testing.T) {
 			wfe.stats.joseErrorCount.Reset()
-			prob := wfe.validNonce(tc.JWS, newRequestEvent())
+			prob := wfe.validNonce(tc.JWS)
 			if tc.ExpectedResult == nil && prob != nil {
 				t.Fatal(fmt.Sprintf("Expected nil result, got %#v", prob))
 			} else {
diff --git a/wfe2/wfe.go b/wfe2/wfe.go
@@ -161,7 +161,6 @@ func (wfe *WebFrontEndImpl) HandleFunc(mux *http.ServeMux, pattern string, h web
 				nonce, err := wfe.nonceService.Nonce()
 				if err == nil {
 					response.Header().Set("Replay-Nonce", nonce)
-					logEvent.ResponseNonce = nonce
 				} else {
 					logEvent.AddError("unable to make nonce: %s", err)
 				}

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ func (wfe WebFrontEndImpl) HandleFunc(mux http.ServeMux, pattern string, h web`
`161`	`161`	`nonce, err := wfe.nonceService.Nonce()`
`162`	`162`	`if err == nil {`
`163`	`163`	`response.Header().Set("Replay-Nonce", nonce)`
`164`		`- logEvent.ResponseNonce = nonce`
`165`	`164`	`} else {`
`166`	`165`	`logEvent.AddError("unable to make nonce: %s", err)`
`167`	`166`	`}`