Fix notary keys requests for all keys #3296
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
S7evinK
added
spec-compliance
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3296 +/- ##
==========================================
- Coverage 65.74% 65.71% -0.04%
==========================================
Files 509 509
Lines 57464 57471 +7
==========================================
- Hits 37780 37767 -13
- Misses 15855 15871 +16
- Partials 3829 3833 +4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
This reverts commit 955f949.
kegsay
requested changes
Jan 8, 2024
federationapi/federationapi_test.go
Outdated
| validateFunc: func(t *testing.T, resp util.JSONResponse) { | ||
| want := util.JSONResponse{ | ||
| Code: http.StatusBadRequest, | ||
| JSON: spec.BadJSON("The request body could not be decoded into valid JSON. unexpected end of JSON input"), |
There was a problem hiding this comment.
It would be nicer to assert the error code and not the entire error message, as that is pretty brittle.
| @@ -43,6 +43,15 @@ func (a *FederationInternalAPI) fetchServerKeysFromCache( | |||
| ctx context.Context, req *api.QueryServerKeysRequest, | |||
| ) ([]gomatrixserverlib.ServerKeys, error) { | |||
| var results []gomatrixserverlib.ServerKeys | |||
|
|
|||
| // We got a request for _all_ server keys, return them. | |||
| if len(req.KeyIDToCriteria) == 0 { | |||
There was a problem hiding this comment.
Technically {"server_keys":{"servera":null}} will then be treated as getting all keys.
| var response struct { | ||
| ServerKeys []json.RawMessage `json:"server_keys"` | ||
| } | ||
| response.ServerKeys = []json.RawMessage{} |
There was a problem hiding this comment.
Bad refactor. You forgot to do this, so no keys will be server_keys: null not server_keys: [].
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 should be more spec compliant: