LumeWeb
/
tusd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct parsing Upload-Concat for final uplaods 

Addresses https://github.com/tus/tus-resumable-upload-protocol/issues/123
This commit is contained in:
Marius 2017-01-31 16:58:31 +01:00
parent b05382eced
commit 7710fd79fb
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
concat_test.go
View File

@ -118,6 +118,9 @@ func TestConcat(t *testing.T) {
Method: "POST", Method: "POST",
ReqHeader: map[string]string{ ReqHeader: map[string]string{
"Tus-Resumable": "1.0.0", "Tus-Resumable": "1.0.0",
// A space between `final;` and the first URL should be allowed due to
// compatibility reasons, even if the specification does not define
// it. Therefore this character is included in this test case.
"Upload-Concat": "final; http://tus.io/files/a /files/b/", "Upload-Concat": "final; http://tus.io/files/a /files/b/",
}, },
Code: http.StatusCreated, Code: http.StatusCreated,
@ -153,7 +156,7 @@ func TestConcat(t *testing.T) {
}, },
Code: http.StatusOK, Code: http.StatusOK,
ResHeader: map[string]string{ ResHeader: map[string]string{
"Upload-Concat": "final; http://tus.io/files/a http://tus.io/files/b", "Upload-Concat": "final;http://tus.io/files/a http://tus.io/files/b",
"Upload-Length": "10", "Upload-Length": "10",
"Upload-Offset": "10", "Upload-Offset": "10",
}, },
@ -178,7 +181,7 @@ func TestConcat(t *testing.T) {
Method: "POST", Method: "POST",
ReqHeader: map[string]string{ ReqHeader: map[string]string{
"Tus-Resumable": "1.0.0", "Tus-Resumable": "1.0.0",
"Upload-Concat": "final; http://tus.io/files/c", "Upload-Concat": "final;http://tus.io/files/c",
}, },
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
}).Run(handler, t) }).Run(handler, t)
@ -200,7 +203,7 @@ func TestConcat(t *testing.T) {
Method: "POST", Method: "POST",
ReqHeader: map[string]string{ ReqHeader: map[string]string{
"Tus-Resumable": "1.0.0", "Tus-Resumable": "1.0.0",
"Upload-Concat": "final; /files/huge", "Upload-Concat": "final;/files/huge",
}, },
Code: http.StatusRequestEntityTooLarge, Code: http.StatusRequestEntityTooLarge,
}).Run(handler, t) }).Run(handler, t)
@ -240,7 +243,7 @@ func TestConcat(t *testing.T) {
URL: "", URL: "",
ReqHeader: map[string]string{ ReqHeader: map[string]string{
"Tus-Resumable": "1.0.0", "Tus-Resumable": "1.0.0",
"Upload-Concat": "final; ", "Upload-Concat": "final;",
}, },
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
}).Run(handler, t) }).Run(handler, t)

2
post_test.go
View File

@ -294,7 +294,7 @@ func TestPost(t *testing.T) {
"Tus-Resumable": "1.0.0", "Tus-Resumable": "1.0.0",
"Upload-Length": "300", "Upload-Length": "300",
"Content-Type": "application/offset+octet-stream", "Content-Type": "application/offset+octet-stream",
"Upload-Concat": "final; http://tus.io/files/a http://tus.io/files/b", "Upload-Concat": "final;http://tus.io/files/a http://tus.io/files/b",
}, },
ReqBody: strings.NewReader("hello"), ReqBody: strings.NewReader("hello"),
Code: http.StatusForbidden, Code: http.StatusForbidden,

11
unrouted_handler.go
View File

@ -341,8 +341,11 @@ func (handler *UnroutedHandler) HeadFile(w http.ResponseWriter, r *http.Request)
if info.IsFinal { if info.IsFinal {
v := "final;" v := "final;"
for _, uploadID := range info.PartialUploads { for _, uploadID := range info.PartialUploads {
v += " " + handler.absFileURL(r, uploadID) v += handler.absFileURL(r, uploadID) + " "
} }
// Remove trailing space
v = v[:len(v)-1]
w.Header().Set("Upload-Concat", v) w.Header().Set("Upload-Concat", v)
} }
@ -782,7 +785,7 @@ func serializeMeta(meta map[string]string) string {
// Parse the Upload-Concat header, e.g. // Parse the Upload-Concat header, e.g.
// Upload-Concat: partial // Upload-Concat: partial
// Upload-Concat: final; http://tus.io/files/a /files/b/ // Upload-Concat: final;http://tus.io/files/a /files/b/
func parseConcat(header string) (isPartial bool, isFinal bool, partialUploads []string, err error) { func parseConcat(header string) (isPartial bool, isFinal bool, partialUploads []string, err error) {
if len(header) == 0 { if len(header) == 0 {
return return
@ -793,8 +796,8 @@ func parseConcat(header string) (isPartial bool, isFinal bool, partialUploads []
return return
} }
l := len("final; ") l := len("final;")
if strings.HasPrefix(header, "final; ") && len(header) > l { if strings.HasPrefix(header, "final;") && len(header) > l {
isFinal = true isFinal = true
list := strings.Split(header[l:], " ") list := strings.Split(header[l:], " ")