Refresh HiveGrid Cloud reference snapshot
This commit is contained in:
1 parent
5e99e14772
commit
7f88026f79
5955 files changed
+1177325
-188362
No files matched your search
@@ -1,19 +1,24 @@
|
||||
import UserValidationUtils from "~/utils/app/UserValidationUtils";
|
||||
import type { TFunction } from "i18next";
|
||||
import { useActionData, useLoaderData } from "react-router";
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction } from "react-router";
|
||||
import { ActionFunction, LoaderFunctionArgs, MetaFunction, redirect } from "react-router";
|
||||
import { getTranslations } from "~/locale/i18next.server";
|
||||
import { getUserByEmail, updateUserPassword } from "~/utils/db/users.db.server";
|
||||
import { consumePasswordResetTokenAndUpdatePassword, getUserByEmail } from "~/utils/db/users.db.server";
|
||||
import { hashPassword } from "~/utils/auth/passwordHasher.server";
|
||||
import EventsService from "~/modules/events/services/.server/EventsService";
|
||||
import { UserPasswordUpdatedDto } from "~/modules/events/dtos/UserPasswordUpdatedDto";
|
||||
import IpAddressServiceServer from "~/modules/ipAddress/services/IpAddressService.server";
|
||||
import ResetPasswordScreen from "~/modules/users/components/ResetPasswordScreen";
|
||||
import { createUserSession, getUserInfo, validateCSRFToken } from "~/utils/session.server";
|
||||
import { loadRequiredWebConfig } from "@hivegrid/config";
|
||||
import { absoluteAppRootPath } from "~/utils/app/CrossHostUrls";
|
||||
import { isPasswordResetTokenValid } from "~/services/auth/password-reset-token.server";
|
||||
import { isPasswordResetTokenValid, PASSWORD_RESET_TOKEN_TTL_MS } from "~/services/auth/password-reset-token.server";
|
||||
import { checkAuthRateLimit } from "~/services/auth/auth-rate-limit.server";
|
||||
import { beginAlternativeLoginMfa, LOGIN_MFA_CHALLENGE_PATH } from "~/services/auth/alternative-login-mfa.server";
|
||||
import {
|
||||
AdminFallbackLoginRejected,
|
||||
assertAdminFallbackLoginAllowedForIdentity,
|
||||
isCompletedAdminFallbackLoginResponse,
|
||||
} from "~/services/auth/admin-fallback.server";
|
||||
import { writeAdminSsoAuditEvent } from "~/modules/admin-sso/audit.server";
|
||||
import { revokeAllUserSessionsForUser } from "~/services/auth/sessionStore.server";
|
||||
|
||||
type LoaderData = {
|
||||
email: string;
|
||||
@@ -39,18 +44,14 @@ type ActionData = {
|
||||
verifyToken: string;
|
||||
};
|
||||
};
|
||||
const translateActionText = (t: TFunction, key: string, fallback: string) => {
|
||||
const translated = t(key, { defaultValue: fallback });
|
||||
return translated === key ? fallback : translated;
|
||||
};
|
||||
const translateIpAddressError = (t: TFunction, error: string) => {
|
||||
const translateIpAddressError = (t: (key: string) => string, error: string) => {
|
||||
if (error === "blacklisted") {
|
||||
return t("admin.accounts.ipAddresses.errors.blacklisted");
|
||||
}
|
||||
if (error === "unauthorized") {
|
||||
return t("admin.accounts.ipAddresses.errors.unauthorized");
|
||||
}
|
||||
return error;
|
||||
return t("shared.unexpectedError");
|
||||
};
|
||||
export const action: ActionFunction = async ({ request }) => {
|
||||
const { t } = await getTranslations(request);
|
||||
@@ -72,10 +73,10 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
verifyToken,
|
||||
};
|
||||
if (!email) {
|
||||
return Response.json({ error: translateActionText(t, "account.reset.errors.emailRequired", "Email required"), fields }, { status: 400 });
|
||||
return Response.json({ error: t("account.reset.errors.emailRequired"), fields }, { status: 400 });
|
||||
}
|
||||
const invalidResetTokenError = translateActionText(t, "account.reset.errors.invalidOrExpiredToken", "Invalid or expired reset token.");
|
||||
const rateLimit = checkAuthRateLimit({
|
||||
const invalidResetTokenError = t("account.reset.errors.invalidOrExpiredToken");
|
||||
const rateLimit = await checkAuthRateLimit({
|
||||
request,
|
||||
action: "reset-password",
|
||||
identifier: email,
|
||||
@@ -95,31 +96,68 @@ export const action: ActionFunction = async ({ request }) => {
|
||||
return Response.json({ error: invalidResetTokenError, fields }, { status: 400 });
|
||||
}
|
||||
|
||||
if (!isPasswordResetTokenValid(user, verifyToken)) {
|
||||
if (!user.verifyToken || !user.verifyTokenCreatedAt || !isPasswordResetTokenValid(user, verifyToken)) {
|
||||
return Response.json({ error: invalidResetTokenError, fields }, { status: 400 });
|
||||
}
|
||||
|
||||
try {
|
||||
assertAdminFallbackLoginAllowedForIdentity(user);
|
||||
} catch (error) {
|
||||
if (!(error instanceof AdminFallbackLoginRejected)) {
|
||||
throw error;
|
||||
}
|
||||
await writeAdminSsoAuditEvent({
|
||||
action: "admin.login.fallback.failure",
|
||||
actorAdminUserId: user.admin?.userId,
|
||||
request,
|
||||
meta: { reason: error.reason, email, method: "password-reset", stage: "primary" },
|
||||
});
|
||||
return Response.json({ error: invalidResetTokenError, fields }, { status: 400 });
|
||||
}
|
||||
|
||||
const passwordHash = await hashPassword(password);
|
||||
await updateUserPassword({ passwordHash }, user.id);
|
||||
await EventsService.create({
|
||||
request,
|
||||
event: "user.password.updated",
|
||||
tenantId: null,
|
||||
// Revoke before the credential write so a database error can at worst
|
||||
// force another login; it can never leave old authenticated devices alive
|
||||
// after the password has changed.
|
||||
await revokeAllUserSessionsForUser(user.id);
|
||||
const consumed = await consumePasswordResetTokenAndUpdatePassword({
|
||||
userId: user.id,
|
||||
data: {
|
||||
user: { id: user.id, email: user.email },
|
||||
} satisfies UserPasswordUpdatedDto,
|
||||
passwordHash,
|
||||
expectedVerifyToken: user.verifyToken,
|
||||
expectedVerifyTokenCreatedAt: user.verifyTokenCreatedAt,
|
||||
minimumVerifyTokenCreatedAt: new Date(Date.now() - PASSWORD_RESET_TOKEN_TTL_MS),
|
||||
});
|
||||
if (!consumed) {
|
||||
return Response.json({ error: invalidResetTokenError, fields }, { status: 400 });
|
||||
}
|
||||
// Event is tenant-owned and must not be used for a tenantless credential
|
||||
// mutation. The user-scoped credential write is already committed here; a
|
||||
// diagnostics write must never turn that reset into an apparent failure.
|
||||
|
||||
const successRedirect = absoluteAppRootPath(loadRequiredWebConfig().routing);
|
||||
const mfa = await beginAlternativeLoginMfa({ request, userId: user.id, redirectTo: successRedirect, primaryMethod: "password-reset" });
|
||||
if (mfa.required) {
|
||||
return redirect(LOGIN_MFA_CHALLENGE_PATH, { headers: { "Set-Cookie": mfa.setCookie } });
|
||||
}
|
||||
const userInfo = await getUserInfo(request);
|
||||
return createUserSession(
|
||||
const response = await createUserSession(
|
||||
{
|
||||
...userInfo,
|
||||
userId: user.id,
|
||||
lng: user.locale ?? userInfo.lng,
|
||||
},
|
||||
absoluteAppRootPath(loadRequiredWebConfig().routing)
|
||||
successRedirect,
|
||||
{ request, rotate: true }
|
||||
);
|
||||
if (user.admin && isCompletedAdminFallbackLoginResponse(response)) {
|
||||
await writeAdminSsoAuditEvent({
|
||||
action: "admin.login.fallback.success",
|
||||
actorAdminUserId: user.admin.userId,
|
||||
request,
|
||||
meta: { email: user.email, severity: "warn", method: "password-reset" },
|
||||
});
|
||||
}
|
||||
return response;
|
||||
};
|
||||
|
||||
export const meta: MetaFunction<typeof loader> = ({ data }) => [{ title: data?.title }];
|
||||
|
||||
Reference in new issue
Block a user