Skip to content
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

Jump to bottom

fix permission check for creating comment while mail #22524

Merged
merged 4 commits into from
Jan 28, 2023
Merged

fix permission check for creating comment while mail #22524

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33affdc
fix permission check for creating comment while mail
a1012112796 Jan 19, 2023
a18311c
Update services/mailer/incoming/incoming_handler.go
a1012112796 Jan 21, 2023
ea43d38
Merge branch 'main' into zzc/dev/fix_incomail_perm
lunny Jan 27, 2023
a1e50e3
Merge branch 'main' into zzc/dev/fix_incomail_perm
a1012112796 Jan 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion services/mailer/incoming/incoming_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,17 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u
return err
}

if !perm.CanWriteIssuesOrPulls(issue.IsPull) || issue.IsLocked && !doer.IsAdmin {
// Locked issues require write permissions
if issue.IsLocked && !perm.CanWriteIssuesOrPulls(issue.IsPull) && !doer.IsAdmin {
log.Debug("can't write issue or pull")
return nil
}

if !perm.CanReadIssuesOrPulls(issue.IsPull) {
log.Debug("can't read issue or pull")
return nil
}

switch r := ref.(type) {
case *issues_model.Issue:
attachmentIDs := make([]string, 0, len(content.Attachments))
Expand Down