dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-05-25 14:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check Captcha

Browse Source
This commit is contained in:
Scott Gould
2022-08-23 13:18:36 -04:00
committed by TheArcaneBrony
parent ba0ba4b61e
commit 89ac7f2ce4
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/routes/auth/login.ts
+19 -3
View File
@@ -1,7 +1,8 @@
import { route } from "@fosscord/api";
import { route, getIpAdress } from "@fosscord/api";
import { adjustEmail, Config, FieldErrors, generateToken, LoginSchema, User } from "@fosscord/util";
import crypto from "crypto";
import { Request, Response, Router } from "express";
import fetch from "node-fetch";
let bcrypt: any;
try {
@@ -17,12 +18,13 @@ export default router;
router.post("/", route({ body: "LoginSchema" }), async (req: Request, res: Response) => {
const { login, password, captcha_key, undelete } = req.body as LoginSchema;
const email = adjustEmail(login);
const ip = getIpAdress(req);
const config = Config.get();
if (config.login.requireCaptcha && config.security.captcha.enabled) {
const { sitekey, secret, service } = config.security.captcha;
if (!captcha_key) {
const { sitekey, service } = config.security.captcha;
return res.status(400).json({
captcha_key: ["captcha-required"],
captcha_sitekey: sitekey,
@@ -30,7 +32,21 @@ router.post("/", route({ body: "LoginSchema" }), async (req: Request, res: Respo
});
}
// TODO: check captcha
let captchaUrl = "";
if (service === "recaptcha") {
captchaUrl = `https://www.google.com/recaptcha/api/siteverify=${sitekey}?secret=${secret}&response=${captcha_key}&remoteip=${ip}`;
} else if (service === "hcaptcha") {
captchaUrl = `https://hcaptcha.com/siteverify?sitekey=${sitekey}&secret=${secret}&response=${captcha_key}&remoteip=${ip}`;
}
const response: { success: boolean; "error-codes": string[] } = await (await fetch(captchaUrl, { method: "POST" })).json();
if (!response.success) {
return res.status(400).json({
captcha_key: response["error-codes"],
captcha_sitekey: sitekey,
captcha_service: service
});
}
}
const user = await User.findOneOrFail({
src/api/routes/auth/register.ts
+18 -2
View File
@@ -1,6 +1,7 @@
import { getIpAdress, IPAnalysis, isProxy, route } from "@fosscord/api";
import { adjustEmail, Config, FieldErrors, generateToken, HTTPError, Invite, RegisterSchema, User } from "@fosscord/util";
import { Request, Response, Router } from "express";
import fetch from "node-fetch";
let bcrypt: any;
try {
@@ -44,8 +45,9 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re
}
if (register.requireCaptcha && security.captcha.enabled) {
const { sitekey, secret, service } = security.captcha;
if (!body.captcha_key) {
const { sitekey, service } = security.captcha;
return res?.status(400).json({
captcha_key: ["captcha-required"],
captcha_sitekey: sitekey,
@@ -53,7 +55,21 @@ router.post("/", route({ body: "RegisterSchema" }), async (req: Request, res: Re
});
}
// TODO: check captcha
let captchaUrl = "";
if (service === "recaptcha") {
captchaUrl = `https://www.google.com/recaptcha/api/siteverify=${sitekey}?secret=${secret}&response=${body.captcha_key}&remoteip=${ip}`;
} else if (service === "hcaptcha") {
captchaUrl = `https://hcaptcha.com/siteverify?sitekey=${sitekey}&secret=${secret}&response=${body.captcha_key}&remoteip=${ip}`;
}
const response: { success: boolean; "error-codes": string[] } = await (await fetch(captchaUrl, { method: "POST" })).json();
if (!response.success) {
return res.status(400).json({
captcha_key: response["error-codes"],
captcha_sitekey: sitekey,
captcha_service: service
});
}
}
if (!register.allowMultipleAccounts) {