Skip to content

Fix non-admin users unable to create their first file request (#433) #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kanishka-sahoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix non-admin users unable to create their first file request (#433) #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions internal/webserver/Webserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,12 @@ func (u *AdminView) convertGlobalConfig(view int, user models.User) *AdminView {
u.Users = append(u.Users, userWithUploads)
}
case ViewFileRequests:
// Limits must be set regardless of existing file requests, otherwise a non-admin
// user without any file requests is shown no limits in the UI
if !user.IsAdmin() {
u.FileRequestMaxFiles = configuration.GetEnvironment().MaxFilesGuestUpload
u.FileRequestMaxSize = configuration.GetEnvironment().MaxSizeGuestUploadMb
}
for _, fileRequest := range filerequest.GetAll() {
// Double-checking if the owner of the file request exists
// If the user was manually deleted from the database, this could lead to a crash
Expand All @@ -885,10 +891,6 @@ func (u *AdminView) convertGlobalConfig(view int, user models.User) *AdminView {
}
fileRequest.Files = sortMetaData(fileRequest.Files)
u.FileRequests = append(u.FileRequests, fileRequest)
if !user.IsAdmin() {
u.FileRequestMaxFiles = configuration.GetEnvironment().MaxFilesGuestUpload
u.FileRequestMaxSize = configuration.GetEnvironment().MaxSizeGuestUploadMb
}
}
}

Expand Down
17 changes: 17 additions & 0 deletions internal/webserver/Webserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,3 +671,20 @@ func TestServeWasmE2E(t *testing.T) {
IsHtml: false,
})
}

func TestConvertGlobalConfigFileRequestLimits(t *testing.T) {
env := configuration.GetEnvironment()
// Non-admin user without any file requests must still receive the server limits
user := models.User{Id: 9999, UserLevel: models.UserLevelUser}
view := (&AdminView{}).convertGlobalConfig(ViewFileRequests, user)
test.IsEqualInt(t, len(view.FileRequests), 0)
test.IsEqualInt(t, view.FileRequestMaxFiles, env.MaxFilesGuestUpload)
test.IsEqualInt(t, view.FileRequestMaxSize, env.MaxSizeGuestUploadMb)
test.IsEqualBool(t, view.FileRequestMaxFiles > 0, true)
test.IsEqualBool(t, view.FileRequestMaxSize > 0, true)

user.UserLevel = models.UserLevelAdmin
view = (&AdminView{}).convertGlobalConfig(ViewFileRequests, user)
test.IsEqualInt(t, view.FileRequestMaxFiles, 0)
test.IsEqualInt(t, view.FileRequestMaxSize, 0)
}