Merge df544541025f1b539eaa59cf16de8f6e15c05ba5 into aa6002134e97efefd879b6819c1bfce114b05f42

This commit is contained in:
uddmorningsun 2022-05-28 08:32:59 +08:00 committed by GitHub
commit 7de64335c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 0 deletions

View File

@ -22,6 +22,7 @@ const (
MIMEMSGPACK = "application/x-msgpack"
MIMEMSGPACK2 = "application/msgpack"
MIMEYAML = "application/x-yaml"
MIMEOctetStream = "application/octet-stream"
)
// Binding describes the interface which needs to be implemented for binding the

View File

@ -604,6 +604,27 @@ func (c *Context) SaveUploadedFile(file *multipart.FileHeader, dst string) error
return err
}
// SaveOctetStreamFile is useful for uploading large file since containing request data, it will operate underlying data stream to dst.
func (c *Context) SaveOctetStreamFile(dst string, flag int, perm os.FileMode) error {
if c.GetHeader("Content-Type") != binding.MIMEOctetStream {
return fmt.Errorf("octet stream required %s data format", binding.MIMEOctetStream)
}
method := c.Request.Method
// In particular, only support POST/PATCH/PUT for taking payload according to https://www.rfc-editor.org/rfc/rfc2616#section-9
if method != http.MethodPost && method != http.MethodPatch && method != http.MethodPut {
return fmt.Errorf("invalid http request method, only support POST/PATCH/PUT")
}
out, err := os.OpenFile(dst, flag, perm)
if err != nil {
return err
}
defer out.Close()
_, err = io.Copy(out, c.Request.Body)
return err
}
// Bind checks the Method and Content-Type to select a binding engine automatically,
// Depending on the "Content-Type" header different bindings are used, for example:
// "application/json" --> JSON binding

View File

@ -144,6 +144,38 @@ func TestSaveUploadedCreateFailed(t *testing.T) {
assert.Error(t, c.SaveUploadedFile(f, "/"))
}
func TestSaveOctetStreamFile(t *testing.T) {
buf := new(bytes.Buffer)
_, err := buf.WriteString("large file binary content")
assert.NoError(t, err, "write string error for buffer")
c, _ := CreateTestContext(httptest.NewRecorder())
c.Request, _ = http.NewRequest("POST", "/", buf)
c.Request.Header.Set("Content-Type", binding.MIMEOctetStream)
assert.NoError(t, c.SaveOctetStreamFile("test", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644))
}
func TestSaveOctetStreamFileFailed(t *testing.T) {
buf := new(bytes.Buffer)
_, err := buf.WriteString("large file binary content")
assert.NoError(t, err, "write string error for buffer")
c, _ := CreateTestContext(httptest.NewRecorder())
c.Request, _ = http.NewRequest("GET", "/", buf)
c.Request.Header.Set("Content-Type", binding.MIMEOctetStream)
err = c.SaveOctetStreamFile("test", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
assert.Error(t, err)
assert.Contains(t, err.Error(), "support POST/PATCH/PUT")
c.Request, _ = http.NewRequest("PATCH", "/", buf)
c.Request.Header.Set("Content-Type", binding.MIMEJSON)
err = c.SaveOctetStreamFile("test", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
assert.Error(t, err)
assert.Contains(t, err.Error(), binding.MIMEOctetStream)
}
func TestContextReset(t *testing.T) {
router := New()
c := router.allocateContext()