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

Block registration based on email domain #5157

Merged
merged 11 commits into from
Nov 15, 2018
Merged

Block registration based on email domain #5157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e672015
implement email domain whitelist
adelowo Oct 23, 2018
4fdd1ae
change delimiter to to keep in sync with other sections of the code
adelowo Oct 25, 2018
7115126
update method name
adelowo Oct 25, 2018
5dedcfa
Merge branch 'master' of https://github.com/go-gitea/gitea into limit…
adelowo Oct 25, 2018
2b7056e
Merge branch 'master' into limit_registration_to_email_domain
adelowo Oct 29, 2018
2f475d1
add newline
adelowo Nov 2, 2018
540f8ce
Merge remote-tracking branch 'origin/master' into limit_registration_…
adelowo Nov 2, 2018
512c2f2
update function naming and use strings#ToLower
adelowo Nov 2, 2018
a460be6
Merge branch 'master' into limit_registration_to_email_domain
adelowo Nov 8, 2018
5ac3f3d
Merge branch 'master' into limit_registration_to_email_domain
techknowlogick Nov 14, 2018
2f35804
Add Gitea authors copyright
adelowo Nov 15, 2018
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
Prev Previous commit
Next Next commit
change delimiter to to keep in sync with other sections of the code
  • Loading branch information
@adelowo
adelowo committed Oct 25, 2018
commit 4fdd1aea44222a3b74de2f69bd5c96a1e783dd47
2 changes: 1 addition & 1 deletion custom/conf/app.ini.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ RESET_PASSWD_CODE_LIVE_MINUTES = 180
; Whether a new user needs to confirm their email when registering.
REGISTER_EMAIL_CONFIRM = false
; List of domain names that are allowed to be used to register on a Gitea instance
; gitea.io example.com
; gitea.io,example.com
EMAIL_DOMAIN_WHITELIST=
adelowo marked this conversation as resolved.
Show resolved Hide resolved
; Disallow registration, only allow admins to create accounts.
DISABLE_REGISTRATION = false
Expand Down
2 changes: 1 addition & 1 deletion modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ func newService() {
Service.ResetPwdCodeLives = sec.Key("RESET_PASSWD_CODE_LIVE_MINUTES").MustInt(180)
Service.DisableRegistration = sec.Key("DISABLE_REGISTRATION").MustBool()
Service.AllowOnlyExternalRegistration = sec.Key("ALLOW_ONLY_EXTERNAL_REGISTRATION").MustBool()
Service.EmailDomainWhitelist = sec.Key("EMAIL_DOMAIN_WHITELIST").Strings(" ")
Service.EmailDomainWhitelist = sec.Key("EMAIL_DOMAIN_WHITELIST").Strings(",")
Service.ShowRegistrationButton = sec.Key("SHOW_REGISTRATION_BUTTON").MustBool(!(Service.DisableRegistration || Service.AllowOnlyExternalRegistration))
Service.RequireSignInView = sec.Key("REQUIRE_SIGNIN_VIEW").MustBool()
Service.EnableReverseProxyAuth = sec.Key("ENABLE_REVERSE_PROXY_AUTHENTICATION").MustBool()
Expand Down