θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

prevent accidental lockout from restricted chars in single pass mode #1352

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

Merged
merged 2 commits into from
May 11, 2024
Merged

prevent accidental lockout from restricted chars in single pass mode #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7a555d
prevent accidental lockout from restrict chars in single pass mode
timothycarambat May 11, 2024
8fd76c6
update error message
timothycarambat May 11, 2024
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
18 changes: 14 additions & 4 deletions frontend/src/pages/GeneralSettings/Security/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ function MultiUserMode() {
);
}

const PW_REGEX = new RegExp(/^[a-zA-Z0-9_\-!@$%^&*();]+$/);
function PasswordProtection() {
const [saving, setSaving] = useState(false);
const [hasChanges, setHasChanges] = useState(false);
Expand All @@ -200,10 +201,19 @@ function PasswordProtection() {
const handleSubmit = async (e) => {
e.preventDefault();
if (multiUserModeEnabled) return false;
const form = new FormData(e.target);

if (!PW_REGEX.test(form.get("password"))) {
showToast(
`Your password has restricted characters in it. Allowed symbols are _,-,!,@,$,%,^,&,*,(,),;`,
"error"
);
setSaving(false);
return;
}

setSaving(true);
setHasChanges(false);
const form = new FormData(e.target);
const data = {
usePassword,
newPassword: form.get("password"),
Expand Down Expand Up @@ -323,9 +333,9 @@ function PasswordProtection() {
</div>
<div className="flex items-center justify-between space-x-14">
<p className="text-white/80 text-xs rounded-lg w-96">
By default, you will be the only admin. As an admin you will
need to create accounts for all new users or admins. Do not lose
your password as only an Admin user can reset passwords.
By default, anyone with this password can log into the instance.
Do not lose this password as only the instance maintainer is
able to retrieve or reset the password once set.
</p>
</div>
</div>
Expand Down
9 changes: 8 additions & 1 deletion server/utils/helpers/updateENV.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ const KEY_MAPPING = {
// System Settings
AuthToken: {
envKey: "AUTH_TOKEN",
checks: [requiresForceMode],
checks: [requiresForceMode, noRestrictedChars],
},
JWTSecret: {
envKey: "JWT_SECRET",
Expand Down Expand Up @@ -574,6 +574,13 @@ function validHuggingFaceEndpoint(input = "") {
: null;
}

function noRestrictedChars(input = "") {
const regExp = new RegExp(/^[a-zA-Z0-9_\-!@$%^&*();]+$/);
return !regExp.test(input)
? `Your password has restricted characters in it. Allowed symbols are _,-,!,@,$,%,^,&,*,(,),;`
: null;
}

// This will force update .env variables which for any which reason were not able to be parsed or
// read from an ENV file as this seems to be a complicating step for many so allowing people to write
// to the process will at least alleviate that issue. It does not perform comprehensive validity checks or sanity checks
Expand Down