-
Notifications
You must be signed in to change notification settings - Fork 487
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
handler, s3store, filestore: Serve GET requests from storage provider (…
…#1228) * feat(handler, s3store): implement ContentServerDataStore for direct content serving, closes #1064 - Add ServerDataStore interface - Implement ContentServerDataStore in S3Store with streaming support - Add Range header support for partial content requests - Update StoreComposer to support ContentServer capability - Add tests for new ContentServerDataStore functionality - Update Go version to 1.22.1 * Add documentation * Set Content-Type and Content-Disposition in handler * Handle range request, conditional requests and errors better * Move implementation and test into own files * Use `store.GetUpload` to simulate more realistic usage * Return proper error for incomplete uploads * Rename variable * Remove debug logging * Log outgoing status code * Implement content server for filestore * Undo changes in `go.mod` --------- Co-authored-by: Derrick Hammer <derrick@derrickhammer.com>
- Loading branch information
Showing
8 changed files
with
513 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| package s3store | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "io" | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| "github.com/tus/tusd/v2/pkg/handler" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| awshttp "github.com/aws/aws-sdk-go-v2/aws/transport/http" | ||
| "github.com/aws/aws-sdk-go-v2/service/s3" | ||
| ) | ||
|
|
||
| func (store S3Store) AsServableUpload(upload handler.Upload) handler.ServableUpload { | ||
| return upload.(*s3Upload) | ||
| } | ||
|
|
||
| func (upload *s3Upload) ServeContent(ctx context.Context, w http.ResponseWriter, r *http.Request) error { | ||
| input := &s3.GetObjectInput{ | ||
| Bucket: aws.String(upload.store.Bucket), | ||
| Key: upload.store.keyWithPrefix(upload.objectId), | ||
| } | ||
|
|
||
| // Forward the Range, If-Match, If-None-Match, If-Unmodified-Since, If-Modified-Since headers if present | ||
| if val := r.Header.Get("Range"); val != "" { | ||
| input.Range = aws.String(val) | ||
| } | ||
| if val := r.Header.Get("If-Match"); val != "" { | ||
| input.IfMatch = aws.String(val) | ||
| } | ||
| if val := r.Header.Get("If-None-Match"); val != "" { | ||
| input.IfNoneMatch = aws.String(val) | ||
| } | ||
| if val := r.Header.Get("If-Modified-Since"); val != "" { | ||
| t, err := http.ParseTime(val) | ||
| if err == nil { | ||
| input.IfModifiedSince = aws.Time(t) | ||
| } | ||
| } | ||
| if val := r.Header.Get("If-Unmodified-Since"); val != "" { | ||
| t, err := http.ParseTime(val) | ||
| if err == nil { | ||
| input.IfUnmodifiedSince = aws.Time(t) | ||
| } | ||
| } | ||
|
|
||
| // Let S3 handle the request | ||
| result, err := upload.store.Service.GetObject(ctx, input) | ||
| if err != nil { | ||
| // Delete the headers set by tusd's handler. We don't need them for errors. | ||
| w.Header().Del("Content-Type") | ||
| w.Header().Del("Content-Disposition") | ||
|
|
||
| var respErr *awshttp.ResponseError | ||
| if errors.As(err, &respErr) { | ||
| if respErr.HTTPStatusCode() == http.StatusNotFound || respErr.HTTPStatusCode() == http.StatusForbidden { | ||
| // If the object cannot be found, it means that the upload is not yet complete and we cannot serve it. | ||
| // At this stage it is not possible that the upload itself does not exist, because the handler | ||
| // alredy checked this case. Therefore, we can safely assume that the upload is still in progress. | ||
| return errIncompleteUpload | ||
| } | ||
|
|
||
| if respErr.HTTPStatusCode() == http.StatusNotModified { | ||
| // Content-Location, Date, ETag, Vary, Cache-Control and Expires should be set | ||
| // for 304 Not Modified responses. See https://httpwg.org/specs/rfc9110.html#status.304 | ||
| for _, header := range []string{"Content-Location", "Date", "ETag", "Vary", "Cache-Control", "Expires"} { | ||
| if val := respErr.Response.Header.Get(header); val != "" { | ||
| w.Header().Set(header, val) | ||
| } | ||
| } | ||
|
|
||
| w.WriteHeader(http.StatusNotModified) | ||
| return nil | ||
| } | ||
|
|
||
| if respErr.HTTPStatusCode() == http.StatusRequestedRangeNotSatisfiable { | ||
| // Content-Range should be set for 416 Request Range Not Satisfiable responses. | ||
| // See https://httpwg.org/specs/rfc9110.html#status.304 | ||
| // Note: AWS S3 does not seem to include this header in its response. | ||
| if val := respErr.Response.Header.Get("Content-Range"); val != "" { | ||
| w.Header().Set("Content-Range", val) | ||
| } | ||
|
|
||
| w.WriteHeader(http.StatusRequestedRangeNotSatisfiable) | ||
| return nil | ||
| } | ||
| } | ||
| return err | ||
| } | ||
| defer result.Body.Close() | ||
|
|
||
| // Add Accept-Ranges,Content-*, Cache-Control, ETag, Expires, Last-Modified headers if present in S3 response | ||
| if result.AcceptRanges != nil { | ||
| w.Header().Set("Accept-Ranges", *result.AcceptRanges) | ||
| } | ||
| if result.ContentDisposition != nil { | ||
| w.Header().Set("Content-Disposition", *result.ContentDisposition) | ||
| } | ||
| if result.ContentEncoding != nil { | ||
| w.Header().Set("Content-Encoding", *result.ContentEncoding) | ||
| } | ||
| if result.ContentLanguage != nil { | ||
| w.Header().Set("Content-Language", *result.ContentLanguage) | ||
| } | ||
| if result.ContentLength != nil { | ||
| w.Header().Set("Content-Length", strconv.FormatInt(*result.ContentLength, 10)) | ||
| } | ||
| if result.ContentRange != nil { | ||
| w.Header().Set("Content-Range", *result.ContentRange) | ||
| } | ||
| if result.ContentType != nil { | ||
| w.Header().Set("Content-Type", *result.ContentType) | ||
| } | ||
| if result.CacheControl != nil { | ||
| w.Header().Set("Cache-Control", *result.CacheControl) | ||
| } | ||
| if result.ETag != nil { | ||
| w.Header().Set("ETag", *result.ETag) | ||
| } | ||
| if result.ExpiresString != nil { | ||
| w.Header().Set("Expires", *result.ExpiresString) | ||
| } | ||
| if result.LastModified != nil { | ||
| w.Header().Set("Last-Modified", result.LastModified.Format(http.TimeFormat)) | ||
| } | ||
|
|
||
| statusCode := http.StatusOK | ||
| if result.ContentRange != nil { | ||
| // Use 206 Partial Content for range requests | ||
| statusCode = http.StatusPartialContent | ||
| } else if result.ContentLength != nil && *result.ContentLength == 0 { | ||
| statusCode = http.StatusNoContent | ||
| } | ||
| w.WriteHeader(statusCode) | ||
|
|
||
| _, err = io.Copy(w, result.Body) | ||
| return err | ||
| } |
Oops, something went wrong.