fix: File size exceeds allowed limit of 0 MiB (#1664)

fix: File size exceeds allowed limit of 0 MiB

This could happen in databases without "max-upload-size-mib" setting.

Now, both the front-end and the back-end will start with a default
limit of 32 MiB, even if the key is absent.

It is still possible to disable uploads by setting the value to 0.
This commit is contained in:
Lincoln Nogueira
2023-05-15 10:54:13 -03:00
committed by GitHub
parent cd2bdab683
commit 668a9e88c6
2 changed files with 3 additions and 2 deletions

View File

@ -70,7 +70,8 @@ func (s *Server) registerResourceRoutes(g *echo.Group) {
return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session") return echo.NewHTTPError(http.StatusUnauthorized, "Missing user in session")
} }
maxUploadSetting := s.Store.GetSystemSettingValueOrDefault(&ctx, api.SystemSettingMaxUploadSizeMiBName, "0") // This is the backend default max upload size limit.
maxUploadSetting := s.Store.GetSystemSettingValueOrDefault(&ctx, api.SystemSettingMaxUploadSizeMiBName, "32")
var settingMaxUploadSizeBytes int var settingMaxUploadSizeBytes int
if settingMaxUploadSizeMiB, err := strconv.Atoi(maxUploadSetting); err == nil { if settingMaxUploadSizeMiB, err := strconv.Atoi(maxUploadSetting); err == nil {
settingMaxUploadSizeBytes = settingMaxUploadSizeMiB * MebiByte settingMaxUploadSizeBytes = settingMaxUploadSizeMiB * MebiByte

View File

@ -44,7 +44,7 @@ func (s *Server) registerSystemRoutes(g *echo.Group) {
AllowSignUp: false, AllowSignUp: false,
IgnoreUpgrade: false, IgnoreUpgrade: false,
DisablePublicMemos: false, DisablePublicMemos: false,
MaxUploadSizeMiB: 32, MaxUploadSizeMiB: 32, // this is the frontend default value
AdditionalStyle: "", AdditionalStyle: "",
AdditionalScript: "", AdditionalScript: "",
CustomizedProfile: api.CustomizedProfile{ CustomizedProfile: api.CustomizedProfile{