Skip to content

Commit 252b0a2

Browse files
committed
Remove checks from API code
1 parent 85bd24f commit 252b0a2

File tree

3 files changed

+0
-42
lines changed

3 files changed

+0
-42
lines changed

routers/api/v1/org/avatar.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ package org
55

66
import (
77
"encoding/base64"
8-
"fmt"
98
"net/http"
109

1110
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/setting"
1311
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/modules/typesniffer"
1512
"code.gitea.io/gitea/modules/web"
1613
user_service "code.gitea.io/gitea/services/user"
1714
)
@@ -42,17 +39,6 @@ func UpdateAvatar(ctx *context.APIContext) {
4239
return
4340
}
4441

45-
if int64(len(content)) > setting.Avatar.MaxFileSize {
46-
ctx.Error(http.StatusBadRequest, "AvatarTooBig", fmt.Errorf("The avatar is to big"))
47-
return
48-
}
49-
50-
st := typesniffer.DetectContentType(content)
51-
if !(st.IsImage() && !st.IsSvgImage()) {
52-
ctx.Error(http.StatusBadRequest, "NotAnImage", fmt.Errorf("The avatar is not an image"))
53-
return
54-
}
55-
5642
err = user_service.UploadAvatar(ctx.Org.Organization.AsUser(), content)
5743
if err != nil {
5844
ctx.Error(http.StatusInternalServerError, "UploadAvatar", err)

routers/api/v1/repo/avatar.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ package repo
55

66
import (
77
"encoding/base64"
8-
"fmt"
98
"net/http"
109

1110
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/setting"
1311
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/modules/typesniffer"
1512
"code.gitea.io/gitea/modules/web"
1613
repo_service "code.gitea.io/gitea/services/repository"
1714
)
@@ -49,17 +46,6 @@ func UpdateAvatar(ctx *context.APIContext) {
4946
return
5047
}
5148

52-
if int64(len(content)) > setting.Avatar.MaxFileSize {
53-
ctx.Error(http.StatusBadRequest, "AvatarTooBig", fmt.Errorf("The avatar is to big"))
54-
return
55-
}
56-
57-
st := typesniffer.DetectContentType(content)
58-
if !(st.IsImage() && !st.IsSvgImage()) {
59-
ctx.Error(http.StatusBadRequest, "NotAnImage", fmt.Errorf("The avatar is not an image"))
60-
return
61-
}
62-
6349
err = repo_service.UploadAvatar(ctx, ctx.Repo.Repository, content)
6450
if err != nil {
6551
ctx.Error(http.StatusInternalServerError, "UploadAvatar", err)

routers/api/v1/user/avatar.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ package user
55

66
import (
77
"encoding/base64"
8-
"fmt"
98
"net/http"
109

1110
"code.gitea.io/gitea/modules/context"
12-
"code.gitea.io/gitea/modules/setting"
1311
api "code.gitea.io/gitea/modules/structs"
14-
"code.gitea.io/gitea/modules/typesniffer"
1512
"code.gitea.io/gitea/modules/web"
1613
user_service "code.gitea.io/gitea/services/user"
1714
)
@@ -39,17 +36,6 @@ func UpdateAvatar(ctx *context.APIContext) {
3936
return
4037
}
4138

42-
if int64(len(content)) > setting.Avatar.MaxFileSize {
43-
ctx.Error(http.StatusBadRequest, "AvatarTooBig", fmt.Errorf("The avatar is to big"))
44-
return
45-
}
46-
47-
st := typesniffer.DetectContentType(content)
48-
if !(st.IsImage() && !st.IsSvgImage()) {
49-
ctx.Error(http.StatusBadRequest, "NotAnImage", fmt.Errorf("The avatar is not an image"))
50-
return
51-
}
52-
5339
err = user_service.UploadAvatar(ctx.Doer, content)
5440
if err != nil {
5541
ctx.Error(http.StatusInternalServerError, "UploadAvatar", err)

0 commit comments

Comments
 (0)