wfe: use wildcard patterns in HTTP handlers #7791
Draft
Conversation
This file contains 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 allows us to take advantage of http.ServeMux's wildcard handling. If we first retrieve the handler for a pattern, and then call it ourselves, the values in `request.PathValue(...)` do not get filled.
aarongable
reviewed
Nov 8, 2024
| @@ -421,33 +421,34 @@ func (wfe *WebFrontEndImpl) Handler(stats prometheus.Registerer, oTelHTTPOptions | |||
|
|
|||
| // POSTable ACME endpoints | |||
| wfe.HandleFunc(m, newAcctPath, wfe.NewAccount, "POST") | |||
| wfe.HandleFunc(m, acctPath, wfe.Account, "POST") | |||
| wfe.HandleFunc(m, acctPath+"{acctID}", wfe.Account, "POST") | |||
There was a problem hiding this comment.
I was wondering why you didn't just change acctPath to include the pattern, but then I realized that we also use acctPath (and similar) as an argument to web.relativeEndpoint. Is there a reasonable way to update relativeEndpoint to take a pattern as input?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Previously, we manually parsed path components. As of Go 1.22, we can include wildcards in ServeMux patterns: https://pkg.go.dev/net/http#hdr-Patterns-ServeMux. This simplifies our parsing code a little bit.
To get the values of such wildcards, we use
request.PathValue. Ourmetrics/measured_httpcode interfered with setting those values, so I modified it. Instead of retrieving the handler for a given request, then calling it, we retrieve only the pattern matched by that request. Then we call.ServeHTTP()on the innerServeMux.(Needs unittest updates)