Skip to content

Adding default password criteria to sample config #95

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

Open
minhducsun2002 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding default password criteria to sample config #95

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
69d3d7e
Adding default password criteria to sample config
minhducsun2002 Oct 9, 2019
215b075
Add support for regex-based password requirements
minhducsun2002 Apr 1, 2020
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
3 changes: 2 additions & 1 deletion contest.sample.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"endTime": "2019-02-27T17:30:00.000Z",
"mode": "OI",
"probList": ["LARES", "GCD"],
"allowedCodeExt": [".C", ".CPP"]
"allowedCodeExt": [".C", ".CPP"],
"passwordRegex": ".{6,18}"
}
2 changes: 2 additions & 0 deletions src/controller/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const bcrypt = require("bcryptjs");
const { join } = require("path");
const cwd = require("../config/cwd");
const { passwordRegex } = require("../config/contest");
const Datastore = require("nedb");
const { isUsername, isPassword } = require("../util/userValid");

Expand Down Expand Up @@ -185,6 +186,7 @@ async function updateUserName(user_id, old_name, new_name) {
*/
async function updateUserPassword(user_id, old_pass, new_pass) {
if (!isPassword(new_pass)) throw new Error("Invalid new password");
if (!new_pass.match(passwordRegex)) throw new Error("Password does not match requirements");
const newHashPass = bcrypt.hash(new_pass, bcrypt.genSaltSync(10));

const dbUserPassHash = await readUserPassHash(user_id);
Expand Down
9 changes: 7 additions & 2 deletions src/util/config/contestConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ function parseCtCfg(configData) {
endTime,
mode,
probList,
allowedCodeExt
allowedCodeExt,
passwordRegex: pregex
} = configData;

name = String(name);
Expand All @@ -50,6 +51,9 @@ function parseCtCfg(configData) {
startTime = parseTime(startTime);
endTime = parseTime(endTime);

if (pregex && (typeof pregex !== 'string'))
throw new TypeError(`passwordRegex must be a string, got ${typeof pregex}`);

if (startTime >= endTime) throw new Error("Start time is after end time");

return {
Expand All @@ -58,7 +62,8 @@ function parseCtCfg(configData) {
startTime: startTime,
endTime: endTime,
probList: parseContainer(probList),
allowedCodeExt: parseContainer(allowedCodeExt)
allowedCodeExt: parseContainer(allowedCodeExt),
passwordRegex: new RegExp(pregex ? pregex : '.{6,18}')
};
}

Expand Down