summaryrefslogtreecommitdiff
path: root/packages/client/src/components
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-05-28 05:06:47 +0200
committerGitHub <noreply@github.com>2022-05-28 12:06:47 +0900
commit161659de5cd7633161b0788799b641ff6b7e55f9 (patch)
tree8dff8d5a7ae31a20d38e32ca6dcaa1b34eb95850 /packages/client/src/components
parentenhance: clearly link documentation (diff)
downloadmisskey-161659de5cd7633161b0788799b641ff6b7e55f9.tar.gz
misskey-161659de5cd7633161b0788799b641ff6b7e55f9.tar.bz2
misskey-161659de5cd7633161b0788799b641ff6b7e55f9.zip
enhance: replace signin CAPTCHA with rate limit (#8740)
* enhance: rate limit works without signed in user * fix: make limit key required for limiter As before the fallback limiter key will be set from the endpoint name. * enhance: use limiter for signin * Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした" This reverts commit 02a43a310f6ad0cc9e9beccc26e51ab5b339e15f. * Revert "feat: make captcha required when signin to improve security" This reverts commit b21b0580058c14532ff3f4033e2a9147643bfca6. * fix undefined reference * fix: better error message * enhance: only handle prefix of IPv6
Diffstat (limited to 'packages/client/src/components')
-rw-r--r--packages/client/src/components/signin.vue12
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/client/src/components/signin.vue b/packages/client/src/components/signin.vue
index d283a758a6..be87274020 100644
--- a/packages/client/src/components/signin.vue
+++ b/packages/client/src/components/signin.vue
@@ -14,8 +14,6 @@
<template #prefix><i class="fas fa-lock"></i></template>
<template #caption><button class="_textButton" type="button" @click="resetPassword">{{ i18n.ts.forgotPassword }}</button></template>
</MkInput>
- <MkCaptcha v-if="meta.enableHcaptcha" ref="hcaptcha" v-model="hCaptchaResponse" class="_formBlock captcha" provider="hcaptcha" :sitekey="meta.hcaptchaSiteKey"/>
- <MkCaptcha v-if="meta.enableRecaptcha" ref="recaptcha" v-model="reCaptchaResponse" class="_formBlock captcha" provider="recaptcha" :sitekey="meta.recaptchaSiteKey"/>
<MkButton class="_formBlock" type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? i18n.ts.loggingIn : i18n.ts.login }}</MkButton>
</div>
<div v-if="totpLogin" class="2fa-signin" :class="{ securityKeys: user && user.securityKeys }">
@@ -64,8 +62,6 @@ import { showSuspendedDialog } from '../scripts/show-suspended-dialog';
import { instance } from '@/instance';
import { i18n } from '@/i18n';
-const MkCaptcha = defineAsyncComponent(() => import('./captcha.vue'));
-
let signing = $ref(false);
let user = $ref(null);
let username = $ref('');
@@ -217,6 +213,14 @@ function loginFailed(err) {
showSuspendedDialog();
break;
}
+ case '22d05606-fbcf-421a-a2db-b32610dcfd1b': {
+ os.alert({
+ type: 'error',
+ title: i18n.ts.loginFailed,
+ text: i18n.ts.rateLimitExceeded,
+ });
+ break;
+ }
default: {
console.log(err)
os.alert({