Skip to content

[bug] Fixes cdn url downloads #644

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

Merged
KCarretto merged 1 commit into from
Feb 21, 2024
Merged

[bug] Fixes cdn url downloads #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tavern/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func NewServer(ctx context.Context, options ...func(*Config)) (*Server, error) {
)},
"/graphql": tavernhttp.Endpoint{Handler: newGraphQLHandler(client, git)},
"/c2.C2/": tavernhttp.Endpoint{Handler: newGRPCHandler(client)},
"/cdn/": tavernhttp.Endpoint{Handler: cdn.NewDownloadHandler(client)},
"/cdn/": tavernhttp.Endpoint{Handler: cdn.NewDownloadHandler(client, "/cdn/")},
"/cdn/upload": tavernhttp.Endpoint{Handler: cdn.NewUploadHandler(client)},
"/": tavernhttp.Endpoint{
Handler: www.NewHandler(httpLogger),
Expand Down
6 changes: 3 additions & 3 deletions tavern/internal/cdn/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cdn
import (
"bytes"
"net/http"
"path/filepath"
"strings"

"realm.pub/tavern/internal/ent"
"realm.pub/tavern/internal/ent/file"
Expand All @@ -18,12 +18,12 @@ const (
)

// NewDownloadHandler returns an HTTP handler responsible for downloading a file from the CDN.
func NewDownloadHandler(graph *ent.Client) http.Handler {
func NewDownloadHandler(graph *ent.Client, prefix string) http.Handler {
return errors.WrapHandler(func(w http.ResponseWriter, req *http.Request) error {
ctx := req.Context()

// Get the File name from the request URI
fileName := filepath.Base(req.URL.Path)
fileName := strings.TrimPrefix(req.URL.Path, prefix)
if fileName == "" || fileName == "." || fileName == "/" {
return ErrInvalidFileName
}
Expand Down
2 changes: 1 addition & 1 deletion tavern/internal/cdn/download_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func TestDownload(t *testing.T) {
func newDownloadTest(graph *ent.Client, req *http.Request, checks ...func(t *testing.T, fileContent []byte, err *errors.HTTP)) func(*testing.T) {
return func(t *testing.T) {
// Initialize Download Handler
handler := cdn.NewDownloadHandler(graph)
handler := cdn.NewDownloadHandler(graph, "/download/")

// Send request and record response
w := httptest.NewRecorder()
Expand Down