Check if remote file is empty

app/publish/handler_test.go

@@ -226,3 +226,30 @@ func Test_fetchFile(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, 125000, s.Size())
 }
+
+func Test_fetchFileEmptyRemoteFile(t *testing.T) {
+	ts := test.MockHTTPServer(nil)
+	defer ts.Close()
+	ts.NextResponse <- ""
+
+	h := &Handler{UploadPath: os.TempDir()}
+	r := CreatePublishRequest(t, nil, FormParam{remoteURLParam, fmt.Sprintf("%v/file.mp4", ts.URL)})
+
+	f, err := h.fetchFile(r, 20404)
+	require.EqualError(t, err, "remote file is empty")
+	assert.Nil(t, f)
+}
+
+func Test_fetchFileRemoteFileTooLarge(t *testing.T) {
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Add("Content-Length", fmt.Sprintf("%v", MaxRemoteFileSize+1))
+	}))
+	defer ts.Close()
+
+	h := &Handler{UploadPath: os.TempDir()}
+	r := CreatePublishRequest(t, nil, FormParam{remoteURLParam, fmt.Sprintf("%v/file.mp4", ts.URL)})
+
+	f, err := h.fetchFile(r, 20404)
+	require.EqualError(t, err, fmt.Sprintf("remote file is too large at %v bytes", MaxRemoteFileSize+1))
+	assert.Nil(t, f)
+}

app/publish/publish.go

@@ -33,7 +33,7 @@ var logger = monitor.NewModuleLogger("publish")
 var method = "publish"
 
 const (
-	RemotePublishLimit = 4 << 30 // 4GB
+	MaxRemoteFileSize = 4 << 30 // 4GB
 
 	// fileFieldName refers to the POST field containing file upload
 	fileFieldName = "file"
@@ -265,8 +265,11 @@ func (h Handler) fetchFile(r *http.Request, userID int) (*os.File, error) {
 	if err != nil {
 		return nil, werrors.Wrap(err, "cannot determine remote file size")
 	}
-	if cl >= RemotePublishLimit {
-		return nil, fmt.Errorf("remote file is too big at %v bytes", cl)
+	if cl >= MaxRemoteFileSize {
+		return nil, fmt.Errorf("remote file is too large at %v bytes", cl)
+	}
+	if cl == 0 {
+		return nil, werrors.New("remote file is empty")
 	}
 
 	f, err := h.createFile(userID, fname)
@@ -279,7 +282,16 @@ func (h Handler) fetchFile(r *http.Request, userID int) (*os.File, error) {
 	if err != nil {
 		return nil, err
 	}
+	if numWritten == 0 {
+		f.Close()
+		os.Remove(f.Name())
+		return f, werrors.New("remote file is empty")
+	}
 	log.Infof("saved uploaded file %v (%v bytes written)", f.Name(), numWritten)
 
+	if err := f.Close(); err != nil {
+		return f, err
+	}
+
 	return f, nil
 }