Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: properly return an error and use cache for public keys if possible #10590

Merged
merged 2 commits into from
Nov 18, 2024
Merged

fix: properly return an error and use cache for public keys if possible #10590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
904491c
fix: properly return an error and use cache for public keys if possible
jvillafanez Nov 18, 2024
02488b5
chore: add changelog entry
jvillafanez Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions changelog/unreleased/collaboration-public-keys.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Bugfix: Return an error if we can't get the keys and ensure they're cached

Previously, there was an issue where we could get an error while getting the
public keys from the /hosting/discovery endpoint but we're returning a wrong
success value instead. This is fixed now and we're returning the error.

In addition, the public keys weren't being cached, so we hit the
/hosting/discovery endpoint every time we need to use the public keys. The keys
are now cached so we don't need to hit the endpoint more than what we need.

https://github.com/owncloud/ocis/pull/10590
5 changes: 4 additions & 1 deletion services/collaboration/pkg/proofkeys/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ func (vh *VerifyHandler) Verify(accessToken, url, timestamp, sig64, oldSig64 str
return err
}
pubkeys = newpubkeys
vh.cachedKeys = newpubkeys
}

// build and hash the expected proof
Expand Down Expand Up @@ -195,6 +196,8 @@ func (vh *VerifyHandler) generateProof(accessToken, url, timestamp string) []byt
// The PubKeys returned might be either nil (with the non-nil error), or might
// contain only a PubKeys.Key field (the PubKeys.OldKey might be nil)
func (vh *VerifyHandler) fetchPublicKeys(logger *zerolog.Logger) (*PubKeys, error) {
logger.Debug().Str("WopiAppUrl", vh.discoveryURL).Msg("WopiDiscovery: requesting new public keys")

httpClient := http.Client{
Transport: &http.Transport{
TLSClientConfig: &tls.Config{
Expand All @@ -220,7 +223,7 @@ func (vh *VerifyHandler) fetchPublicKeys(logger *zerolog.Logger) (*PubKeys, erro
Str("WopiAppUrl", vh.discoveryURL).
Int("HttpCode", httpResp.StatusCode).
Msg("WopiDiscovery: wopi app url failed with unexpected code")
return nil, err
return nil, errors.New("wopi app url failed with unexpected code")
}

doc := etree.NewDocument()
Expand Down