Replace ServeStream with ServeContent (#20903)

KN4CK3R · delvh · lunny · web-flow · commit dc0253b0637b · 2022-08-25T12:05:21.000-04:00
* Replace ServeStream with ServeContent.

* Update modules/timeutil/timestamp.go

Co-authored-by: delvh &lt;dev.lh@web.de&gt;

Co-authored-by: delvh &lt;dev.lh@web.de&gt;
Co-authored-by: Lunny Xiao &lt;xiaolunwen@gmail.com&gt;
Co-authored-by: techknowlogick &lt;techknowlogick@gitea.io&gt;
diff --git a/modules/context/context.go b/modules/context/context.go
@@ -358,14 +358,7 @@ func (ctx *Context) SetServeHeaders(filename string) {
 }
 
 // ServeContent serves content to http request
-func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) {
-	modTime := time.Now()
-	for _, p := range params {
-		switch v := p.(type) {
-		case time.Time:
-			modTime = v
-		}
-	}
+func (ctx *Context) ServeContent(name string, r io.ReadSeeker, modTime time.Time) {
 	ctx.SetServeHeaders(name)
 	http.ServeContent(ctx.Resp, ctx.Req, name, modTime, r)
 }
@@ -382,15 +375,6 @@ func (ctx *Context) ServeFile(file string, names ...string) {
 	http.ServeFile(ctx.Resp, ctx.Req, file)
 }
 
-// ServeStream serves file via io stream
-func (ctx *Context) ServeStream(rd io.Reader, name string) {
-	ctx.SetServeHeaders(name)
-	_, err := io.Copy(ctx.Resp, rd)
-	if err != nil {
-		ctx.ServerError("Download file failed", err)
-	}
-}
-
 // UploadStream returns the request body or the first form file
 // Only form files need to get closed.
 func (ctx *Context) UploadStream() (rd io.ReadCloser, needToClose bool, err error) {
diff --git a/modules/timeutil/timestamp.go b/modules/timeutil/timestamp.go
@@ -54,6 +54,11 @@ func (ts TimeStamp) AsTime() (tm time.Time) {
 	return ts.AsTimeInLocation(setting.DefaultUILocation)
 }
 
+// AsLocalTime convert timestamp as time.Time in local location
+func (ts TimeStamp) AsLocalTime() time.Time {
+	return time.Unix(int64(ts), 0)
+}
+
 // AsTimeInLocation convert timestamp as time.Time in Local locale
 func (ts TimeStamp) AsTimeInLocation(loc *time.Location) (tm time.Time) {
 	tm = time.Unix(int64(ts), 0).In(loc)
diff --git a/routers/api/packages/composer/api.go b/routers/api/packages/composer/api.go
@@ -99,7 +99,7 @@ func createPackageMetadataResponse(registryURL string, pds []*packages_model.Pac
 			Name:     pd.Package.Name,
 			Version:  pd.Version.Version,
 			Type:     packageType,
-			Created:  time.Unix(int64(pd.Version.CreatedUnix), 0),
+			Created:  pd.Version.CreatedUnix.AsLocalTime(),
 			Metadata: pd.Metadata.(*composer_module.Metadata),
 			Dist: Dist{
 				Type:     "zip",
diff --git a/routers/api/packages/composer/composer.go b/routers/api/packages/composer/composer.go
@@ -184,7 +184,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackage creates a new package
diff --git a/routers/api/packages/conan/conan.go b/routers/api/packages/conan/conan.go
@@ -475,7 +475,7 @@ func downloadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // DeleteRecipeV1 deletes the requested recipe(s)
@@ -723,7 +723,7 @@ func listRevisions(ctx *context.Context, revisions []*conan_model.PropertyValue)
 
 	revs := make([]*revisionInfo, 0, len(revisions))
 	for _, rev := range revisions {
-		revs = append(revs, &revisionInfo{Revision: rev.Value, Time: time.Unix(int64(rev.CreatedUnix), 0)})
+		revs = append(revs, &revisionInfo{Revision: rev.Value, Time: rev.CreatedUnix.AsLocalTime()})
 	}
 
 	jsonResponse(ctx, http.StatusOK, &RevisionList{revs})
@@ -743,7 +743,7 @@ func LatestRecipeRevision(ctx *context.Context) {
 		return
 	}
 
-	jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: time.Unix(int64(revision.CreatedUnix), 0)})
+	jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: revision.CreatedUnix.AsLocalTime()})
 }
 
 // LatestPackageRevision gets the latest package revision
@@ -760,7 +760,7 @@ func LatestPackageRevision(ctx *context.Context) {
 		return
 	}
 
-	jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: time.Unix(int64(revision.CreatedUnix), 0)})
+	jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: revision.CreatedUnix.AsLocalTime()})
 }
 
 // ListRecipeRevisionFiles gets a list of all recipe revision files
diff --git a/routers/api/packages/generic/generic.go b/routers/api/packages/generic/generic.go
@@ -53,7 +53,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackage uploads the specific generic package.
diff --git a/routers/api/packages/helm/helm.go b/routers/api/packages/helm/helm.go
@@ -138,7 +138,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackage creates a new package
diff --git a/routers/api/packages/maven/maven.go b/routers/api/packages/maven/maven.go
@@ -177,7 +177,7 @@ func servePackageFile(ctx *context.Context, params parameters) {
 		}
 	}
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackageFile adds a file to the package. If the package does not exist, it gets created.
diff --git a/routers/api/packages/npm/npm.go b/routers/api/packages/npm/npm.go
@@ -103,7 +103,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackage creates a new package
diff --git a/routers/api/packages/nuget/api.go b/routers/api/packages/nuget/api.go
@@ -176,7 +176,7 @@ func createRegistrationLeafResponse(l *linkBuilder, pd *packages_model.PackageDe
 	return &RegistrationLeafResponse{
 		Type:                 []string{"Package", "http://schema.nuget.org/catalog#Permalink"},
 		Listed:               true,
-		Published:            time.Unix(int64(pd.Version.CreatedUnix), 0),
+		Published:            pd.Version.CreatedUnix.AsLocalTime(),
 		RegistrationLeafURL:  l.GetRegistrationLeafURL(pd.Package.Name, pd.Version.Version),
 		PackageContentURL:    l.GetPackageDownloadURL(pd.Package.Name, pd.Version.Version),
 		RegistrationIndexURL: l.GetRegistrationIndexURL(pd.Package.Name),
diff --git a/routers/api/packages/nuget/nuget.go b/routers/api/packages/nuget/nuget.go
@@ -179,7 +179,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackage creates a new package with the metadata contained in the uploaded nupgk file
@@ -378,7 +378,7 @@ func DownloadSymbolFile(ctx *context.Context) {
 		return
 	}
 
-	s, _, err := packages_service.GetPackageFileStream(ctx, pfs[0])
+	s, pf, err := packages_service.GetPackageFileStream(ctx, pfs[0])
 	if err != nil {
 		if err == packages_model.ErrPackageNotExist || err == packages_model.ErrPackageFileNotExist {
 			apiError(ctx, http.StatusNotFound, err)
@@ -389,7 +389,7 @@ func DownloadSymbolFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pfs[0].Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // DeletePackage hard deletes the package
diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go
@@ -69,7 +69,7 @@ func packageDescriptorToMetadata(baseURL string, pd *packages_model.PackageDescr
 	return &versionMetadata{
 		Version:    pd.Version.Version,
 		ArchiveURL: fmt.Sprintf("%s/files/%s.tar.gz", baseURL, url.PathEscape(pd.Version.Version)),
-		Published:  time.Unix(int64(pd.Version.CreatedUnix), 0),
+		Published:  pd.Version.CreatedUnix.AsLocalTime(),
 		Pubspec:    pd.Metadata.(*pub_module.Metadata).Pubspec,
 	}
 }
@@ -271,5 +271,5 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
diff --git a/routers/api/packages/pypi/pypi.go b/routers/api/packages/pypi/pypi.go
@@ -90,7 +90,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackageFile adds a file to the package. If the package does not exist, it gets created.
diff --git a/routers/api/packages/rubygems/rubygems.go b/routers/api/packages/rubygems/rubygems.go
@@ -188,7 +188,7 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
 
 // UploadPackageFile adds a file to the package. If the package does not exist, it gets created.
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
@@ -468,7 +468,8 @@ func download(ctx *context.Context, archiveName string, archiver *repo_model.Rep
 		return
 	}
 	defer fr.Close()
-	ctx.ServeStream(fr, downloadName)
+
+	ctx.ServeContent(downloadName, fr, archiver.CreatedUnix.AsLocalTime())
 }
 
 // InitiateDownload will enqueue an archival request, as needed.  It may submit
diff --git a/routers/web/user/package.go b/routers/web/user/package.go
@@ -393,5 +393,5 @@ func DownloadPackageFile(ctx *context.Context) {
 	}
 	defer s.Close()
 
-	ctx.ServeStream(s, pf.Name)
+	ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())
 }
diff --git a/services/packages/packages.go b/services/packages/packages.go
@@ -402,7 +402,7 @@ func Cleanup(unused context.Context, olderThan time.Duration) error {
 }
 
 // GetFileStreamByPackageNameAndVersion returns the content of the specific package file
-func GetFileStreamByPackageNameAndVersion(ctx context.Context, pvi *PackageInfo, pfi *PackageFileInfo) (io.ReadCloser, *packages_model.PackageFile, error) {
+func GetFileStreamByPackageNameAndVersion(ctx context.Context, pvi *PackageInfo, pfi *PackageFileInfo) (io.ReadSeekCloser, *packages_model.PackageFile, error) {
 	log.Trace("Getting package file stream: %v, %v, %s, %s, %s, %s", pvi.Owner.ID, pvi.PackageType, pvi.Name, pvi.Version, pfi.Filename, pfi.CompositeKey)
 
 	pv, err := packages_model.GetVersionByNameAndVersion(ctx, pvi.Owner.ID, pvi.PackageType, pvi.Name, pvi.Version)
@@ -418,7 +418,7 @@ func GetFileStreamByPackageNameAndVersion(ctx context.Context, pvi *PackageInfo,
 }
 
 // GetFileStreamByPackageVersionAndFileID returns the content of the specific package file
-func GetFileStreamByPackageVersionAndFileID(ctx context.Context, owner *user_model.User, versionID, fileID int64) (io.ReadCloser, *packages_model.PackageFile, error) {
+func GetFileStreamByPackageVersionAndFileID(ctx context.Context, owner *user_model.User, versionID, fileID int64) (io.ReadSeekCloser, *packages_model.PackageFile, error) {
 	log.Trace("Getting package file stream: %v, %v, %v", owner.ID, versionID, fileID)
 
 	pv, err := packages_model.GetVersionByID(ctx, versionID)
@@ -449,7 +449,7 @@ func GetFileStreamByPackageVersionAndFileID(ctx context.Context, owner *user_mod
 }
 
 // GetFileStreamByPackageVersion returns the content of the specific package file
-func GetFileStreamByPackageVersion(ctx context.Context, pv *packages_model.PackageVersion, pfi *PackageFileInfo) (io.ReadCloser, *packages_model.PackageFile, error) {
+func GetFileStreamByPackageVersion(ctx context.Context, pv *packages_model.PackageVersion, pfi *PackageFileInfo) (io.ReadSeekCloser, *packages_model.PackageFile, error) {
 	pf, err := packages_model.GetFileForVersionByName(ctx, pv.ID, pfi.Filename, pfi.CompositeKey)
 	if err != nil {
 		return nil, nil, err
@@ -459,7 +459,7 @@ func GetFileStreamByPackageVersion(ctx context.Context, pv *packages_model.Packa
 }
 
 // GetPackageFileStream returns the content of the specific package file
-func GetPackageFileStream(ctx context.Context, pf *packages_model.PackageFile) (io.ReadCloser, *packages_model.PackageFile, error) {
+func GetPackageFileStream(ctx context.Context, pf *packages_model.PackageFile) (io.ReadSeekCloser, *packages_model.PackageFile, error) {
 	pb, err := packages_model.GetBlobByID(ctx, pf.BlobID)
 	if err != nil {
 		return nil, nil, err

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func DownloadPackageFile(ctx *context.Context) {`
`184`	`184`	`}`
`185`	`185`	`defer s.Close()`
`186`	`186`
`187`		`- ctx.ServeStream(s, pf.Name)`
	`187`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`// UploadPackage creates a new package`
Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@ func downloadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {`
`475`	`475`	`}`
`476`	`476`	`defer s.Close()`
`477`	`477`
`478`		`- ctx.ServeStream(s, pf.Name)`
	`478`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`479`	`479`	`}`
`480`	`480`
`481`	`481`	`// DeleteRecipeV1 deletes the requested recipe(s)`
`@@ -723,7 +723,7 @@ func listRevisions(ctx context.Context, revisions []conan_model.PropertyValue)`
`723`	`723`
`724`	`724`	`revs := make([]*revisionInfo, 0, len(revisions))`
`725`	`725`	`for _, rev := range revisions {`
`726`		`- revs = append(revs, &revisionInfo{Revision: rev.Value, Time: time.Unix(int64(rev.CreatedUnix), 0)})`
	`726`	`+ revs = append(revs, &revisionInfo{Revision: rev.Value, Time: rev.CreatedUnix.AsLocalTime()})`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`jsonResponse(ctx, http.StatusOK, &RevisionList{revs})`
`@@ -743,7 +743,7 @@ func LatestRecipeRevision(ctx *context.Context) {`
`743`	`743`	`return`
`744`	`744`	`}`
`745`	`745`
`746`		`- jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: time.Unix(int64(revision.CreatedUnix), 0)})`
	`746`	`+ jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: revision.CreatedUnix.AsLocalTime()})`
`747`	`747`	`}`
`748`	`748`
`749`	`749`	`// LatestPackageRevision gets the latest package revision`
`@@ -760,7 +760,7 @@ func LatestPackageRevision(ctx *context.Context) {`
`760`	`760`	`return`
`761`	`761`	`}`
`762`	`762`
`763`		`- jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: time.Unix(int64(revision.CreatedUnix), 0)})`
	`763`	`+ jsonResponse(ctx, http.StatusOK, &revisionInfo{Revision: revision.Value, Time: revision.CreatedUnix.AsLocalTime()})`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`// ListRecipeRevisionFiles gets a list of all recipe revision files`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func DownloadPackageFile(ctx *context.Context) {`
`53`	`53`	`}`
`54`	`54`	`defer s.Close()`
`55`	`55`
`56`		`- ctx.ServeStream(s, pf.Name)`
	`56`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// UploadPackage uploads the specific generic package.`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ func DownloadPackageFile(ctx *context.Context) {`
`138`	`138`	`}`
`139`	`139`	`defer s.Close()`
`140`	`140`
`141`		`- ctx.ServeStream(s, pf.Name)`
	`141`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// UploadPackage creates a new package`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ func servePackageFile(ctx *context.Context, params parameters) {`
`177`	`177`	`}`
`178`	`178`	`}`
`179`	`179`
`180`		`- ctx.ServeStream(s, pf.Name)`
	`180`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`// UploadPackageFile adds a file to the package. If the package does not exist, it gets created.`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func DownloadPackageFile(ctx *context.Context) {`
`103`	`103`	`}`
`104`	`104`	`defer s.Close()`
`105`	`105`
`106`		`- ctx.ServeStream(s, pf.Name)`
	`106`	`+ ctx.ServeContent(pf.Name, s, pf.CreatedUnix.AsLocalTime())`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`// UploadPackage creates a new package`