Phase 6: media
CI / Test (ubuntu-latest) (push) Canceled after 0s
CI / Test (windows-latest) (push) Canceled after 0s
CI / Storage tests on PostgreSQL (push) Canceled after 0s
CI / Complement (federation off) (push) Canceled after 0s
CI / golangci-lint (push) Canceled after 0s
CI / Smoke test the binary (push) Canceled after 0s
CI / Test (ubuntu-latest) (push) Canceled after 0s
CI / Test (windows-latest) (push) Canceled after 0s
CI / Storage tests on PostgreSQL (push) Canceled after 0s
CI / Complement (federation off) (push) Canceled after 0s
CI / golangci-lint (push) Canceled after 0s
CI / Smoke test the binary (push) Canceled after 0s
Implements PLAN.md Phase 6: the media repository. Clients upload files, reserve an mxc:// URI and upload to it later, download and ask for thumbnails, all through the authenticated media endpoints of Matrix 1.11; other servers download this server's media through the federation media endpoints, and media uploaded elsewhere is fetched over federation on first use and kept. internal/mediaapi is the component. Content goes into a BlobStore named by its SHA-256, so the same file uploaded twice is stored once and the hash doubles as the ETag; the metadata that maps an mxc:// URI onto a blob is in media_repository and media_thumbnails. The local-filesystem store writes to a temporary file and renames it into place once hashed, so nothing ever refers to half a file. A storage driver can bring its own store through storage.BlobProvider, which is where PocketBase's filesystem abstraction (local or S3) plugs in with Phase 10. Reserved uploads belong to the user who made them, take one upload, lapse after a day, and are capped per user; a download of one waits for its content, woken in memory the moment it arrives, for as long as timeout_ms allows. Thumbnails come from a fixed set of configured sizes, so a thousand requested sizes cannot mean a thousand resizes. They are made on first request and kept, never enlarge, honour a JPEG's EXIF orientation, and point at the original when it already fits. The pixel count is checked from the header before anything is decoded, at most four resizes run at once, and concurrent requests for the same thumbnail share one. Remote media is fetched through the signed client: the multipart/mixed answer of Matrix 1.11, with a fallback to the legacy download endpoint for servers that answer M_UNRECOGNIZED, and Location redirects followed by a dialer that refuses loopback, private and link-local addresses. Concurrent requests share one fetch, detached from the request that started it. With federation off nothing is fetched, and what was cached before is still served. Downloads carry a sandboxing CSP, nosniff, inline Content-Disposition only for the types the spec lists as safe, and private immutable caching. The unauthenticated legacy download endpoints are off by default behind media.legacy_unauthenticated_downloads. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
6aaf554336
commit
92836f8dcd
40 files changed
+4729
-63
No files matched your search
@@ -20,6 +20,7 @@ import (
|
||||
"github.com/dariuszjaniak/warp/server/internal/config"
|
||||
"github.com/dariuszjaniak/warp/server/internal/federation"
|
||||
"github.com/dariuszjaniak/warp/server/internal/httputil"
|
||||
"github.com/dariuszjaniak/warp/server/internal/mediaapi"
|
||||
"github.com/dariuszjaniak/warp/server/internal/ratelimit"
|
||||
"github.com/dariuszjaniak/warp/server/internal/roomserver"
|
||||
"github.com/dariuszjaniak/warp/server/internal/settings"
|
||||
@@ -34,6 +35,8 @@ type ClientAPI struct {
|
||||
users *userapi.API
|
||||
rooms *roomserver.API
|
||||
sync *syncapi.API
|
||||
media *mediaapi.API
|
||||
legacyMedia bool
|
||||
settings *settings.Service
|
||||
federation *federation.Gate
|
||||
remoteProfile RemoteProfiles
|
||||
@@ -57,6 +60,10 @@ type ClientAPI struct {
|
||||
// loop — the one place where rate limiting makes the load worse rather
|
||||
// than better.
|
||||
limitSync *ratelimit.Limiter
|
||||
|
||||
// limitMedia covers downloads and thumbnails, which a client asks for
|
||||
// in bursts: every avatar in a room list at once.
|
||||
limitMedia *ratelimit.Limiter
|
||||
}
|
||||
|
||||
// Options configure the component.
|
||||
@@ -85,6 +92,14 @@ type Options struct {
|
||||
// pretending there is a stream to read.
|
||||
Sync *syncapi.API
|
||||
|
||||
// Media is the media repository. Without it the media endpoints
|
||||
// answer M_UNRECOGNIZED.
|
||||
Media *mediaapi.API
|
||||
|
||||
// LegacyMediaDownloads serves the deprecated unauthenticated download
|
||||
// and thumbnail endpoints too.
|
||||
LegacyMediaDownloads bool
|
||||
|
||||
// Settings is the runtime-settings service; the registration switch is
|
||||
// read from it on every registration attempt.
|
||||
Settings *settings.Service
|
||||
@@ -138,6 +153,8 @@ func New(opts Options) (*ClientAPI, error) {
|
||||
users: opts.Users,
|
||||
rooms: opts.Rooms,
|
||||
sync: opts.Sync,
|
||||
media: opts.Media,
|
||||
legacyMedia: opts.LegacyMediaDownloads,
|
||||
settings: opts.Settings,
|
||||
federation: opts.Federation,
|
||||
remoteProfile: opts.RemoteProfiles,
|
||||
@@ -159,11 +176,12 @@ func New(opts Options) (*ClientAPI, error) {
|
||||
c.limitRoomCreate = ratelimit.New(bucket(opts.RateLimit.RoomCreate))
|
||||
c.limitJoin = ratelimit.New(bucket(opts.RateLimit.Join))
|
||||
c.limitSync = ratelimit.New(bucket(opts.RateLimit.Sync))
|
||||
c.limitMedia = ratelimit.New(bucket(opts.RateLimit.Media))
|
||||
} else {
|
||||
c.limitDefault, c.limitLogin, c.limitRegister =
|
||||
ratelimit.Disabled(), ratelimit.Disabled(), ratelimit.Disabled()
|
||||
c.limitRoomCreate, c.limitJoin = ratelimit.Disabled(), ratelimit.Disabled()
|
||||
c.limitSync = ratelimit.Disabled()
|
||||
c.limitSync, c.limitMedia = ratelimit.Disabled(), ratelimit.Disabled()
|
||||
}
|
||||
return c, nil
|
||||
}
|
||||
@@ -229,6 +247,7 @@ func (c *ClientAPI) RegisterRoutes(r *httputil.Router) {
|
||||
|
||||
c.registerRoomRoutes(r)
|
||||
c.registerSyncRoutes(r)
|
||||
c.registerMediaRoutes(r)
|
||||
}
|
||||
|
||||
// registerSyncRoutes adds the endpoints the syncapi serves, if there is
|
||||
|
||||
Reference in new issue
Block a user