Ratstail91/kingdombattles
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed security hole, token now needed to change password

Browse Source
This commit is contained in:
Kayne Ruse
2019-05-08 17:15:17 +10:00
parent 6c15bbc4a3
commit 3a34d78712
4 changed files with 111 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/accounts.js
+38 -22
View File
@@ -20,7 +20,7 @@ function signup(connection) {
//validate email, username and password
if (!validateEmail(fields.email) || fields.username.length < 4 || fields.username.length > 100 || fields.password.length < 8 || fields.password !== fields.retype) {
res.write('<p>Invalid signup data</p>');
res.status(400).write('Invalid signup data');
res.end();
return;
}
@@ -31,13 +31,13 @@ function signup(connection) {
if (err) throw err;
if (results[0].email !== 0) {
res.write('<p>Email already registered!</p>');
res.status(400).write('Email already registered!');
res.end();
return;
}
if (results[0].username !== 0) {
res.write('<p>Username already registered!</p>');
res.status(400).write('Username already registered!');
res.end();
return;
}
@@ -76,7 +76,7 @@ function signup(connection) {
return;
}
res.write('<p>Verification email sent!</p>');
res.status(200).write('Verification email sent!');
res.end();
});
})
@@ -209,36 +209,52 @@ function passwordChange(connection) {
//validate password, retype
if (!validateEmail(fields.email) || fields.password.length < 8 || fields.password !== fields.retype) {
res.write('<p>Invalid password change data</p>');
res.status(400).write('Invalid password change data');
res.end();
return;
}
//generate the new salt, hash
bcrypt.genSalt(11, (err, salt) => {
//validate token
query = 'SELECT sessions.token FROM sessions WHERE sessions.accountId IN (SELECT id FROM accounts WHERE email = ?);';
connection.query(query, [fields.email], (err, results) => {
if (err) throw err;
bcrypt.hash(fields.password, salt, (err, hash) => {
if (err) throw err;
let query = 'UPDATE accounts SET salt = ?, hash = ? WHERE email = ?;';
connection.query(query, [salt, hash, fields.email], (err) => {
let found = false;
results.map((result) => { if (result.token == fields.token) found = true; });
if (!found) {
res.status(400).write('Invalid password change authentication');
res.end();
return;
}
//generate the new salt, hash
bcrypt.genSalt(11, (err, salt) => {
if (err) throw err;
bcrypt.hash(fields.password, salt, (err, hash) => {
if (err) throw err;
//clear all session data for this user (a 'feature')
let query = 'DELETE FROM sessions WHERE sessions.accountId IN (SELECT accounts.id FROM accounts WHERE email = ?);';
connection.query(query, [fields.email], (err) => {
let query = 'UPDATE accounts SET salt = ?, hash = ? WHERE email = ?;';
connection.query(query, [salt, hash, fields.email], (err) => {
if (err) throw err;
//create the new session
let rand = Math.floor(Math.random() * 100000);
let query = 'INSERT INTO sessions (accountId, token) VALUES ((SELECT accounts.id FROM accounts WHERE email = ?), ?);';
connection.query(query, [fields.email, rand], (err) => {
//clear all session data for this user (a 'feature')
let query = 'DELETE FROM sessions WHERE sessions.accountId IN (SELECT accounts.id FROM accounts WHERE email = ?);';
connection.query(query, [fields.email], (err) => {
if (err) throw err;
//send json containing the account info
res.status(200).json({
token: rand
//create the new session
let rand = Math.floor(Math.random() * 100000);
let query = 'INSERT INTO sessions (accountId, token) VALUES ((SELECT accounts.id FROM accounts WHERE email = ?), ?);';
connection.query(query, [fields.email, rand], (err) => {
if (err) throw err;
//send json containing the account info
res.status(200).json({
token: rand
});
});
});
});
src/components/pages/home.jsx
+20 -8
View File
@@ -13,7 +13,9 @@ class Home extends React.Component {
constructor(props) {
super(props);
this.state = {
changedPassword: false
changedPassword: false,
signedUp: false,
signupMsg: ''
};
}
@@ -27,7 +29,7 @@ class Home extends React.Component {
if (!this.state.changedPassword) {
PasswordChangePanel = () => {
return (<PasswordChange onSubmit={() => { this.setState({changedPassword: true}) }} />);
return (<PasswordChange onPasswordChange={() => { this.setState({changedPassword: true}) }} />);
}
} else {
PasswordChangePanel = () => {
@@ -48,12 +50,22 @@ class Home extends React.Component {
if (this.state.changedPassword) {
this.setState({changedPassword: false});
}
return (
<div>
<Signup />
<Login />
</div>
);
if (!this.state.signedUp) {
return (
<div>
<Signup onSignup={(msg) => this.setState( {signedUp: true, signupMsg: msg} )} />
<Login />
</div>
);
} else {
return (
<div>
<p>{this.state.signupMsg}</p>
<Login />
</div>
);
}
};
}
src/components/panels/password_change.jsx
+8 -6
View File
@@ -55,12 +55,18 @@ class PasswordChange extends React.Component {
let xhr = new XMLHttpRequest();
formData.append('email', this.props.email);
formData.append('token', this.props.token);
xhr.onreadystatechange = () => {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
let json = JSON.parse(xhr.responseText);
this.props.sessionChange(json.token);
//DEBUGGING
if (this.props.onPasswordChange) {
this.props.onPasswordChange();
}
}
else if (xhr.status === 400) {
@@ -72,11 +78,6 @@ class PasswordChange extends React.Component {
//send the XHR
xhr.open('POST', form.action, true);
xhr.send(formData);
//DEBUGGING
if (this.props.onSubmit) {
this.props.onSubmit();
}
}
validateInput(e) {
@@ -122,7 +123,8 @@ class PasswordChange extends React.Component {
function mapStoreToProps(store) {
return {
email: store.account.email
email: store.account.email,
token: store.account.token
}
}
src/components/panels/signup.jsx
+45 -16
View File
@@ -26,7 +26,7 @@ export default class Signup extends React.Component {
<p>{this.state.warning}</p>
</div>
<form action='/signup' method='post' onSubmit={(e) => this.validateInput(e)}>
<form action='/signup' method='post' onSubmit={(e) => this.submit(e)}>
<div>
<label>Email:</label>
<input type='text' name='email' value={this.state.email} onChange={this.updateEmail.bind(this)} />
@@ -53,31 +53,60 @@ export default class Signup extends React.Component {
);
}
validateInput(e) {
submit(e) {
e.preventDefault();
if (!this.validateInput()) {
return;
}
//build the XHR
let form = e.target;
let formData = new FormData(form);
let xhr = new XMLHttpRequest();
xhr.onreadystatechange = () => {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
if (this.props.onSignup) {
this.props.onSignup(xhr.responseText);
}
}
else if (xhr.status === 400) {
this.setWarning(xhr.responseText);
}
}
};
//send the XHR
xhr.open('POST', form.action, true);
xhr.send(formData);
}
validateInput() {
if (!validateEmail(this.state.email)) {
e.preventDefault();
this.setWarning('Invalid Email');
return false;
}
else if (this.state.username.length < 4) {
e.preventDefault();
if (this.state.username.length < 4) {
this.setWarning('Minimum username length is 4 characters');
return false;
}
else if (this.state.username.length > 100) {
e.preventDefault();
if (this.state.username.length > 100) {
this.setWarning('Maximum username length is 100 characters');
return false;
}
else if (this.state.password.length < 8) {
e.preventDefault();
if (this.state.password.length < 8) {
this.setWarning('Minimum password length is 8 characters');
return false;
}
if (this.state.password !== this.state.retype) {
this.setWarning('Passwords do not match');
return false;
}
else if (this.state.password !== this.state.retype) {
e.preventDefault();
this.setWarning('Passwords do not match');
}
return true;
}
setWarning(s) {