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

Do not send activation email if manual confirm is set #19119

Merged
merged 2 commits into from
Mar 18, 2022
Merged

Do not send activation email if manual confirm is set #19119

merged 2 commits into from
Mar 18, 2022

Conversation

zeripath
Copy link
Contributor

If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because handleUserCreated is not checking for this case.

Fix #17263

Signed-off-by: Andrew Thornton [email protected]

@zeripath
Do not send activation email if manual confirm is set
e316cfc 
If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because `handleUserCreated` is not checking for this case.

Fix go-gitea#17263

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added type/bug topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! backport/v1.16 labels Mar 17, 2022
@zeripath zeripath added this to the 1.17.0 milestone Mar 17, 2022
@zeripath
Copy link
Contributor Author

Backport will be slightly difficult as we can't use the new string.

Instead I suggest we just use the email confirmation is disabled string.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 17, 2022
@skobkin
Copy link

skobkin commented Mar 17, 2022 •
edited
Loading

Thanks!

By the way shouldn't Gitea send an email to the administrator when new user registered?

Probably it's out of kind/bug scope, but would be nice to have too.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 18, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 18, 2022
lunny
lunny requested changes Mar 18, 2022
View reviewed changes
Copy link
Member

@lunny lunny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to clarify whether RegisterManualConfirm means a register will only be confirmed manually or RegisterManualConfirm means a register could be activated by email and also could be confirmed manually.

@skobkin
Copy link

skobkin commented Mar 18, 2022

We need to clarify whether RegisterManualConfirm means a register will only be confirmed manually or RegisterManualConfirm means a register could be activated by email and also could be confirmed manually.

Currently it's already indirectly documented in the config cheat sheet.
But it'll only be better if it'd be written in a more clear way.

@lunny lunny merged commit 7fc5fd6 into go-gitea:main Mar 18, 2022
@lunny
Copy link
Member

lunny commented Mar 18, 2022

Please send back port.

zeripath added a commit to zeripath/gitea that referenced this pull request Mar 18, 2022
@zeripath @lunny
Do not send activation email if manual confirm is set (go-gitea#19119)
854178b 
Backport go-gitea#19119

If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because `handleUserCreated` is not checking for this case.

Fix go-gitea#17263

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>
@zeripath zeripath mentioned this pull request Mar 18, 2022
Merged
@zeripath zeripath deleted the fix-17263-no-activation-email-if-turned-off branch March 18, 2022 10:29
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 19, 2022
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
9d7ab3c 
* giteaoffical/main:
  remove not needed (go-gitea#19128)
  Add warning to set SENDMAIL_ARGS to --  (go-gitea#19102)
  Do not send activation email if manual confirm is set (go-gitea#19119)
  Update tool dependencies (go-gitea#19120)
  Delete related notifications on issue deletion too (go-gitea#18953)
  nit fix (go-gitea#19116)
  Store the foreign ID of issues during migration  (go-gitea#18446)
  Remove italics for `due_date_not_set` (go-gitea#19113)
zeripath added a commit that referenced this pull request Mar 19, 2022
@zeripath
Do not send activation email if manual confirm is set (#19119) (#19122)
5bb0c92 
Backport #19119

If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because `handleUserCreated` is not checking for this case.

Fix #17263

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added the backport/done All backports for this PR have been created label Mar 19, 2022
zeripath added a commit to zeripath/gitea that referenced this pull request Mar 23, 2022
@zeripath
Changelog for 1.16.5
fb7de1c 
 ## [1.16.5](https://github.com/go-gitea/gitea/releases/tag/1.16.5) - 2022-03-23

* BREAKING
  * Bump to build with go1.18 (go-gitea#19120 et al) (go-gitea#19127)
* SECURITY
  * Prevent redirect to Host (2) (go-gitea#19175) (go-gitea#19186)
  * Try to prevent autolinking of displaynames by email readers (go-gitea#19169) (go-gitea#19183)
  * Clean paths when looking in Storage (go-gitea#19124) (go-gitea#19179)
  * Do not send notification emails to inactive users (go-gitea#19131) (go-gitea#19139)
  * Do not send activation email if manual confirm is set (go-gitea#19119) (go-gitea#19122)
* ENHANCEMENTS
  * Use the new/choose link for New Issue on project page (go-gitea#19172) (go-gitea#19176)
* BUGFIXES
  * Fix compare link in active feeds for new branch (go-gitea#19149) (go-gitea#19185)
  * Redirect .wiki/* ui link to /wiki (go-gitea#18831) (go-gitea#19184)
  * Ensure deploy keys with write access can push (go-gitea#19010) (go-gitea#19182)
  * Ensure that setting.LocalURL always has a trailing slash (go-gitea#19171) (go-gitea#19177)
  * Cleanup protected branches when deleting users & teams (go-gitea#19158) (go-gitea#19174)
  * Use IterateBufferSize whilst querying repositories during adoption check (go-gitea#19140) (go-gitea#19160)
  * Fix NPE /repos/issues/search when not signed in (go-gitea#19154) (go-gitea#19155)
  * Use custom favicon when viewing static files if it exists (go-gitea#19130) (go-gitea#19152)
  * Fix the editor height in review box (go-gitea#19003) (go-gitea#19147)
  * Ensure isSSH is set whenever DISABLE_HTTP_GIT is set (go-gitea#19028) (go-gitea#19146)
  * Fix wrong scopes caused by empty scope input (go-gitea#19029) (go-gitea#19145)
  * Make migrations SKIP_TLS_VERIFY apply to git too (go-gitea#19132) (go-gitea#19141)
  * Handle email address not exist (go-gitea#19089) (go-gitea#19121)
* MISC
  * Update json-iterator to allow compilation with go1.18 (go-gitea#18644) (go-gitea#19100)
  * Update golang.org/x/crypto (go-gitea#19097) (go-gitea#19098)

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Mar 23, 2022
Merged
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@zeripath @lunny
Do not send activation email if manual confirm is set (go-gitea#19119)
5ac4fdd 
If the mailer is configured then even if Manual confirm is set an activation email
is still being sent because `handleUserCreated` is not checking for this case.

Fix go-gitea#17263

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! type/bug
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

REGISTER_MANUAL_CONFIRM does not require manual change to Activated as described
6 participants
@zeripath @skobkin @lunny @techknowlogick @delvh @GiteaBot