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

Url preview endpoint #3444

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Url preview endpoint #3444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5845244
url preview test version
adnull Sep 29, 2024
46473c1
implemented waiting for free thumb generator
adnull Sep 29, 2024
6c8158b
added storing response as file cache
adnull Sep 30, 2024
625bc3d
fixed dummy user id
adnull Sep 30, 2024
016500b
fixed some linter errors
adnull Sep 30, 2024
dd3fd3d
fix complexity
adnull Sep 30, 2024
d8d6df3
url blacklist
adnull Sep 30, 2024
677fbb2
refactoring
adnull Oct 1, 2024
ff87ec3
made handler sy-test compatible
adnull Oct 1, 2024
c860640
linters
adnull Oct 1, 2024
ea0b25b
lint fix
adnull Oct 1, 2024
4232fa3
tests tentative
adnull Oct 8, 2024
0224d94
url_preview tests
adnull Oct 9, 2024
7fff56c
fix linter errors
adnull Oct 9, 2024
f58da42
fixed race conditions
adnull Oct 9, 2024
f9cf05c
Merge remote-tracking branch 'hq-origin/main' into url-preview
adnull Nov 14, 2024
6d1b595
mods relocate + licence
adnull Nov 14, 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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ require (
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/image v0.18.0
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
golang.org/x/net v0.30.0
golang.org/x/sync v0.9.0
golang.org/x/term v0.25.0
gopkg.in/h2non/bimg.v1 v1.1.9
Expand Down Expand Up @@ -141,7 +142,6 @@ require (
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/time v0.6.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions mediaapi/fileutils/fileutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ func moveFile(src types.Path, dst types.Path) error {
return nil
}

func MoveFile(src types.Path, dst types.Path) error {
return moveFile(src, dst)
}

func createTempFileWriter(absBasePath config.Path) (*bufio.Writer, *os.File, types.Path, error) {
tmpDir, err := createTempDir(absBasePath)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion mediaapi/routing/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,10 +308,11 @@ func (r *downloadRequest) respondFromLocalFile(
return nil, fmt.Errorf("fileutils.GetPathFromBase64Hash: %w", err)
}
file, err := os.Open(filePath)
defer file.Close() // nolint: errcheck, staticcheck, megacheck
if err != nil {
return nil, fmt.Errorf("os.Open: %w", err)
}
defer file.Close() // nolint: errcheck, staticcheck, megacheck

stat, err := file.Stat()
if err != nil {
return nil, fmt.Errorf("file.Stat: %w", err)
Expand Down
7 changes: 7 additions & 0 deletions mediaapi/routing/routing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ func Setup(
MXCToResult: map[string]*types.RemoteRequestResult{},
}

// v1 url_preview endpoint requiring auth

downloadHandler := makeDownloadAPI("download_unauthed", &cfg.MediaAPI, rateLimits, db, client, federationClient, activeRemoteRequests, activeThumbnailGeneration, false)
v3mux.Handle("/download/{serverName}/{mediaId}", downloadHandler).Methods(http.MethodGet, http.MethodOptions)
v3mux.Handle("/download/{serverName}/{mediaId}/{downloadName}", downloadHandler).Methods(http.MethodGet, http.MethodOptions)
Expand All @@ -102,6 +104,11 @@ func Setup(
v1mux.Handle("/download/{serverName}/{mediaId}", downloadHandlerAuthed).Methods(http.MethodGet, http.MethodOptions)
v1mux.Handle("/download/{serverName}/{mediaId}/{downloadName}", downloadHandlerAuthed).Methods(http.MethodGet, http.MethodOptions)

urlPreviewHandler := httputil.MakeAuthAPI("preview_url", userAPI, makeUrlPreviewHandler(&cfg.MediaAPI, rateLimits, db, activeThumbnailGeneration))
v1mux.Handle("/preview_url", urlPreviewHandler).Methods(http.MethodGet, http.MethodOptions)
// That method is deprecated according to spec but still in use
v3mux.Handle("/preview_url", urlPreviewHandler).Methods(http.MethodGet, http.MethodOptions)

v1mux.Handle("/thumbnail/{serverName}/{mediaId}",
httputil.MakeHTTPAPI("thumbnail", userAPI, cfg.Global.Metrics.Enabled, makeDownloadAPI("thumbnail_authed_client", &cfg.MediaAPI, rateLimits, db, client, federationClient, activeRemoteRequests, activeThumbnailGeneration, false), httputil.WithAuth()),
).Methods(http.MethodGet, http.MethodOptions)
Expand Down
Loading
Loading