mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-09-11 16:44:30 +02:00
Compare commits
4 commits
f0994355d4
...
b71186d958
Author | SHA1 | Date | |
---|---|---|---|
|
b71186d958 |
||
|
c362499cef |
||
|
14774fa153 |
||
|
ff805d8ae1 |
4 changed files with 15 additions and 6 deletions
|
@ -442,8 +442,9 @@
|
||||||
#registration_token_file =
|
#registration_token_file =
|
||||||
|
|
||||||
# The public site key for reCaptcha. If this is provided, reCaptcha
|
# The public site key for reCaptcha. If this is provided, reCaptcha
|
||||||
# becomes required during registration, **even if token registration is
|
# becomes required during registration. If both captcha *and*
|
||||||
# enabled**.
|
# registration token are enabled, both will be required during
|
||||||
|
# registration.
|
||||||
#
|
#
|
||||||
# IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
|
# IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
|
||||||
# DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR
|
# DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR
|
||||||
|
|
|
@ -180,11 +180,18 @@ pub fn check(config: &Config) -> Result {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if config.recaptcha_site_key.is_some() && config.recaptcha_private_site_key.is_none() {
|
||||||
|
return Err!(Config(
|
||||||
|
"recaptcha_private_site_key",
|
||||||
|
"reCAPTCHA private site key is required when reCAPTCHA site key is set."
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
if config.allow_registration
|
if config.allow_registration
|
||||||
&& !config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
|
&& !config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
|
||||||
&& config.registration_token.is_none()
|
&& config.registration_token.is_none()
|
||||||
&& config.registration_token_file.is_none()
|
&& config.registration_token_file.is_none()
|
||||||
&& !(config.recaptcha_site_key.is_some() && config.recaptcha_private_site_key.is_some())
|
&& config.recaptcha_site_key.is_none()
|
||||||
{
|
{
|
||||||
return Err!(Config(
|
return Err!(Config(
|
||||||
"registration_token",
|
"registration_token",
|
||||||
|
|
|
@ -557,8 +557,9 @@ pub struct Config {
|
||||||
pub registration_token_file: Option<PathBuf>,
|
pub registration_token_file: Option<PathBuf>,
|
||||||
|
|
||||||
/// The public site key for reCaptcha. If this is provided, reCaptcha
|
/// The public site key for reCaptcha. If this is provided, reCaptcha
|
||||||
/// becomes required during registration, **even if token registration is
|
/// becomes required during registration. If both captcha *and*
|
||||||
/// enabled**.
|
/// registration token are enabled, both will be required during
|
||||||
|
/// registration.
|
||||||
///
|
///
|
||||||
/// IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
|
/// IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
|
||||||
/// DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR
|
/// DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR
|
||||||
|
|
|
@ -192,7 +192,7 @@ pub async fn try_auth(
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
| Ok() => {
|
| Ok(()) => {
|
||||||
uiaainfo.completed.push(AuthType::ReCaptcha);
|
uiaainfo.completed.push(AuthType::ReCaptcha);
|
||||||
},
|
},
|
||||||
| Err(e) => {
|
| Err(e) => {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue