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

Jump to bottom

Ensure remote signing keys expire after at most 7 days #613

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Ensure remote signing keys expire after at most 7 days #613

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
fb6904a
Ensure remote signing keys expire after at most 7 days
turt2live Aug 30, 2024
4703a06
Merge branch 'main' into travis/fix-signing-key-validity
turt2live Sep 4, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

* Return a 404 instead of 500 when clients access media which is frozen.
* Ensure the request parameters are correctly set for authenticated media client requests.
* Ensure remote signing keys expire after at most 7 days.
* Fixed parsing of `Authorization` headers for federated servers.

## [1.3.7] - July 30, 2024
Expand Down
5 changes: 4 additions & 1 deletion matrix/requests_signing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"math"
"net/http"
"sync"
"time"
Expand Down Expand Up @@ -128,11 +129,13 @@ func QuerySigningKeys(serverName string) (ServerSigningKeys, error) {
if keyInfo.ServerName != serverName {
return nil, fmt.Errorf("got keys for '%s' but expected '%s'", keyInfo.ServerName, serverName)
}
maxValidity := time.Now().Add(7 * 24 * time.Hour)
if keyInfo.ValidUntilTs <= util.NowMillis() {
return nil, errors.New("returned server keys are expired")
}
keyInfo.ValidUntilTs = int64(math.Min(float64(keyInfo.ValidUntilTs), float64(maxValidity.UnixMilli())))
cacheUntil := time.Until(time.UnixMilli(keyInfo.ValidUntilTs)) / 2
if cacheUntil <= (6 * time.Second) {
if cacheUntil <= (1 * time.Minute) {
return nil, errors.New("returned server keys would expire too quickly")
}

Expand Down
Loading