Switch to hand-rolled http mux. #313
Merged
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 fixes the error where `/priv/doc/https://` URLs were being improperly unescaped before fetching/signing.
This helps detect errors in the mux config. Also, restrict mux to GET/HEAD - this uncovered a faulty test that expected POST to work, when it never had.
This complies with the recommendation at https://wicg.github.io/webpackage/draft-yasskin-http-origin-signed-responses.html#seccons-content-sniffing.
alin04
reviewed
May 24, 2019
Have mux not depend on handler types. (This means the caller of New() may accidentally swap handlers, but that vector for error is only one line of the whole code base, so it seems like a reasonable trade-off.)
|
Test for the escaping is in signer_test.
|
|
Also, got rid of all the capitalization changes & the need for the separate |
alin04
approved these changes
May 28, 2019
| // True iff url matches pattern, as defined by an [URLSet.Sign] block in the | ||
| // config file. The format of this URLPattern is validated by | ||
| // validateSignURLPattern in config.go. | ||
| func signURLMatches(url *url.URL, pattern *util.URLPattern) error { | ||
| for _, b := range []byte(url.String()) { |
There was a problem hiding this comment.
Optional, leverage Go's IndexFunc, e.g. if IndexFun(url.String(), isFallbackURLCodePoint) == -1 { ... }
There was a problem hiding this comment.
Could work? https://golang.org/pkg/bytes/#IndexFunc is based on a UTF-8 decoding of the string, whereas I want to go byte-by-byte. I think any multibyte UTF-8 char is also false for isFallbackURLCodePoint? But I don't want to have to think about it. :)
twifkak
added a commit
to twifkak/amppackager
that referenced
this pull request
Jun 11, 2019
Fixes breakage from ampproject#313 (9c34d5e). Also, when "fetch/sign URLs do not match config", log the underlying reason(s). Finally, improve the logging in gateway_server slightly + `go fmt`.
Merged
twifkak
added a commit
that referenced
this pull request
Jun 11, 2019
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.
This fixes the error where
/priv/doc/https://URLs were beingimproperly unescaped before fetching/signing.
In addition, validate that sign URLs don't contain any special characters, per the WICG recommendation.
The new mux code depends directly on the handlers, because we don't need any fancy dependency inversion. This required movings tests into a different package to break the import cycle, which in turn required changing the visibility of a lot of things.
Resolves #310.