Skip to content

Commit 511eb00

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 891a827 commit 511eb00

File tree

13 files changed

+14
-40
lines changed

13 files changed

+14
-40
lines changed

‎routers/api/packages/api.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func verifyAuth(r *web.Router, authMethods []auth.Method) {
9999
ctx.Doer, err = authGroup.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session)
100100
if err != nil {
101101
log.Error("Failed to verify user: %v", err)
102-
ctx.HTTPError(http.StatusUnauthorized, "authGroup.Verify")
102+
ctx.HTTPError(http.StatusUnauthorized, "Failed to authenticate user")
103103
return
104104
}
105105
ctx.IsSigned = ctx.Doer != nil

‎routers/api/packages/conan/auth.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataS
3434

3535
u, err := user_model.GetUserByID(req.Context(), packageMeta.UserID)
3636
if err != nil {
37-
log.Error("GetUserByID: %v", err)
3837
return nil, err
3938
}
4039
if packageMeta.Scope != "" {

‎routers/api/packages/conan/conan.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ func jsonResponse(ctx *context.Context, status int, obj any) {
5555
// https://github.com/conan-io/conan/issues/6613
5656
ctx.Resp.Header().Set("Content-Type", "application/json")
5757
ctx.Status(status)
58-
if err := json.NewEncoder(ctx.Resp).Encode(obj); err != nil {
59-
log.Error("JSON encode: %v", err)
60-
}
58+
_ = json.NewEncoder(ctx.Resp).Encode(obj)
6159
}
6260

6361
func apiError(ctx *context.Context, status int, obj any) {
@@ -392,7 +390,6 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey
392390
if isConanfileFile {
393391
metadata, err := conan_module.ParseConanfile(buf)
394392
if err != nil {
395-
log.Error("Error parsing package metadata: %v", err)
396393
apiError(ctx, http.StatusInternalServerError, err)
397394
return
398395
}
@@ -418,7 +415,6 @@ func uploadFile(ctx *context.Context, fileFilter container.Set[string], fileKey
418415
} else {
419416
info, err := conan_module.ParseConaninfo(buf)
420417
if err != nil {
421-
log.Error("Error parsing conan info: %v", err)
422418
apiError(ctx, http.StatusInternalServerError, err)
423419
return
424420
}

‎routers/api/packages/conda/conda.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
packages_model "code.gitea.io/gitea/models/packages"
1414
conda_model "code.gitea.io/gitea/models/packages/conda"
1515
"code.gitea.io/gitea/modules/json"
16-
"code.gitea.io/gitea/modules/log"
1716
packages_module "code.gitea.io/gitea/modules/packages"
1817
conda_module "code.gitea.io/gitea/modules/packages/conda"
1918
"code.gitea.io/gitea/modules/util"
@@ -184,10 +183,7 @@ func EnumeratePackages(ctx *context.Context) {
184183
}
185184

186185
resp.WriteHeader(http.StatusOK)
187-
188-
if err := json.NewEncoder(w).Encode(repoData); err != nil {
189-
log.Error("JSON encode: %v", err)
190-
}
186+
_ = json.NewEncoder(w).Encode(repoData)
191187
}
192188

193189
func UploadPackageFile(ctx *context.Context) {

‎routers/api/packages/container/auth.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataS
3535

3636
u, err := user_model.GetPossibleUserByID(req.Context(), packageMeta.UserID)
3737
if err != nil {
38-
log.Error("GetPossibleUserByID: %v", err)
3938
return nil, err
4039
}
4140

‎routers/api/packages/container/container.go‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,9 +448,9 @@ func PutBlobsUpload(ctx *context.Context) {
448448
return
449449
}
450450

451-
// There was a strange bug: the "Close" fails with error "close .../tmp/package-upload/....: file already closed"
452-
// AFAIK there should be no other "Close" call to the uploader between NewBlobUploader and this line.
453-
// At least it's safe to call Close twice, so ignore the error.
451+
// Some SDK (e.g.: minio) will close the Reader if it is also a Closer after "uploading".
452+
// And we don't need to wrap the reader to anything else because the SDK will benefit from other interfaces like Seeker.
453+
// It's safe to call Close twice, so ignore the error.
454454
_ = uploader.Close()
455455

456456
if err := container_service.RemoveBlobUploadByID(ctx, uploader.ID); err != nil {
@@ -733,9 +733,7 @@ func serveBlob(ctx *context.Context, pfd *packages_model.PackageFileDescriptor)
733733
defer s.Close()
734734

735735
setResponseHeaders(ctx.Resp, headers)
736-
if _, err := io.Copy(ctx.Resp, s); err != nil {
737-
log.Error("Error whilst copying content to response: %v", err)
738-
}
736+
_, _ = io.Copy(ctx.Resp, s)
739737
}
740738

741739
// https://github.com/opencontainers/distribution-spec/blob/main/spec.md#content-discovery

‎routers/api/packages/generic/generic.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"unicode"
1212

1313
packages_model "code.gitea.io/gitea/models/packages"
14-
"code.gitea.io/gitea/modules/log"
1514
packages_module "code.gitea.io/gitea/modules/packages"
1615
"code.gitea.io/gitea/routers/api/packages/helper"
1716
"code.gitea.io/gitea/services/context"
@@ -101,7 +100,6 @@ func UploadPackage(ctx *context.Context) {
101100

102101
buf, err := packages_module.CreateHashedBufferFromReader(upload)
103102
if err != nil {
104-
log.Error("Error creating hashed buffer: %v", err)
105103
apiError(ctx, http.StatusInternalServerError, err)
106104
return
107105
}

‎routers/api/packages/helm/helm.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
packages_model "code.gitea.io/gitea/models/packages"
1616
"code.gitea.io/gitea/modules/json"
17-
"code.gitea.io/gitea/modules/log"
1817
"code.gitea.io/gitea/modules/optional"
1918
packages_module "code.gitea.io/gitea/modules/packages"
2019
helm_module "code.gitea.io/gitea/modules/packages/helm"
@@ -86,16 +85,14 @@ func Index(ctx *context.Context) {
8685
}
8786

8887
ctx.Resp.WriteHeader(http.StatusOK)
89-
if err := yaml.NewEncoder(ctx.Resp).Encode(&Index{
88+
_ = yaml.NewEncoder(ctx.Resp).Encode(&Index{
9089
APIVersion: "v1",
9190
Entries: entries,
9291
Generated: time.Now(),
9392
ServerInfo: &ServerInfo{
9493
ContextPath: setting.AppSubURL + "/api/packages/" + url.PathEscape(ctx.Package.Owner.Name) + "/helm",
9594
},
96-
}); err != nil {
97-
log.Error("YAML encode failed: %v", err)
98-
}
95+
})
9996
}
10097

10198
// DownloadPackageFile serves the content of a package

‎routers/api/packages/nuget/auth.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataS
2626
token, err := auth_model.GetAccessTokenBySHA(req.Context(), req.Header.Get("X-NuGet-ApiKey"))
2727
if err != nil {
2828
if !(auth_model.IsErrAccessTokenNotExist(err) || auth_model.IsErrAccessTokenEmpty(err)) {
29-
log.Error("GetAccessTokenBySHA: %v", err)
3029
return nil, err
3130
}
3231
return nil, nil
3332
}
3433

3534
u, err := user_model.GetUserByID(req.Context(), token.UID)
3635
if err != nil {
37-
log.Error("GetUserByID: %v", err)
3836
return nil, err
3937
}
4038

‎routers/api/packages/nuget/nuget.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"code.gitea.io/gitea/models/db"
1818
packages_model "code.gitea.io/gitea/models/packages"
1919
nuget_model "code.gitea.io/gitea/models/packages/nuget"
20-
"code.gitea.io/gitea/modules/log"
2120
"code.gitea.io/gitea/modules/optional"
2221
packages_module "code.gitea.io/gitea/modules/packages"
2322
nuget_module "code.gitea.io/gitea/modules/packages/nuget"
@@ -38,12 +37,8 @@ func apiError(ctx *context.Context, status int, obj any) {
3837
func xmlResponse(ctx *context.Context, status int, obj any) { //nolint:unparam // status is always StatusOK
3938
ctx.Resp.Header().Set("Content-Type", "application/atom+xml; charset=utf-8")
4039
ctx.Resp.WriteHeader(status)
41-
if _, err := ctx.Resp.Write([]byte(xml.Header)); err != nil {
42-
log.Error("Write failed: %v", err)
43-
}
44-
if err := xml.NewEncoder(ctx.Resp).Encode(obj); err != nil {
45-
log.Error("XML encode failed: %v", err)
46-
}
40+
_, _ = ctx.Resp.Write([]byte(xml.Header))
41+
_ = xml.NewEncoder(ctx.Resp).Encode(obj)
4742
}
4843

4944
// https://github.com/NuGet/NuGet.Client/blob/dev/src/NuGet.Core/NuGet.Protocol/LegacyFeed/V2FeedQueryBuilder.cs

0 commit comments

Comments
 (0)