Skip to content

fix: dont allow nonmaster to update user's authData #7

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
Jun 29, 2025
Merged

fix: dont allow nonmaster to update user's authData #7

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
4fbd7f4
fix: dont allow nonmaster to update user's authData
nikhilcares22 Jun 28, 2025
8ad0f70
fix: lint error
nikhilcares22 Jun 29, 2025
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
2 changes: 1 addition & 1 deletion src/Adapters/Auth/mfa.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class MFAAdapter extends AuthAdapter {
});
} else if (opts.period && typeof opts.period === 'object') {
Object.keys(opts.period).forEach(method => {
if (opts.period.hasOwnProperty(method) && typeof opts.period[method] === 'number') {
if (typeof opts.period[method] === 'number') {
this.period[method] = opts.period[method] ?? defaultPeriods[method] ?? 30;
}
});
Expand Down
91 changes: 62 additions & 29 deletions src/RestWrite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,9 @@ RestWrite.prototype.ensureUniqueAuthDataId = async function () {
key => this.data.authData[key] && this.data.authData[key].id
);

if (!hasAuthDataId) { return; }
if (!hasAuthDataId) {
return;
}

const r = await Auth.findUsersWithAuthData(this.config, this.data.authData);
const results = this.filteredObjectsByACL(r);
Expand Down Expand Up @@ -547,7 +549,6 @@ RestWrite.prototype.handleAuthData = async function (authData) {

// User found with provided authData
if (results.length === 1) {

this.storage.authProvider = Object.keys(authData).join(',');

const { hasMutatedAuthData, mutatedAuthData } = Auth.hasMutatedAuthData(
Expand Down Expand Up @@ -809,7 +810,9 @@ RestWrite.prototype._validateEmail = function () {
};

RestWrite.prototype._validatePasswordPolicy = function () {
if (!this.config.passwordPolicy) { return Promise.resolve(); }
if (!this.config.passwordPolicy) {
return Promise.resolve();
}
return this._validatePasswordRequirements().then(() => {
return this._validatePasswordHistory();
});
Expand Down Expand Up @@ -843,18 +846,20 @@ RestWrite.prototype._validatePasswordRequirements = function () {
if (this.config.passwordPolicy.doNotAllowUsername === true) {
if (this.data.username) {
// username is not passed during password reset
if (this.data.password.indexOf(this.data.username) >= 0)
{ return Promise.reject(new Parse.Error(Parse.Error.VALIDATION_ERROR, containsUsernameError)); }
if (this.data.password.indexOf(this.data.username) >= 0) {
return Promise.reject(new Parse.Error(Parse.Error.VALIDATION_ERROR, containsUsernameError));
}
} else {
// retrieve the User object using objectId during password reset
return this.config.database.find('_User', { objectId: this.objectId() }).then(results => {
if (results.length != 1) {
throw undefined;
}
if (this.data.password.indexOf(results[0].username) >= 0)
{ return Promise.reject(
new Parse.Error(Parse.Error.VALIDATION_ERROR, containsUsernameError)
); }
if (this.data.password.indexOf(results[0].username) >= 0) {
return Promise.reject(
new Parse.Error(Parse.Error.VALIDATION_ERROR, containsUsernameError)
);
}
return Promise.resolve();
});
}
Expand All @@ -878,19 +883,21 @@ RestWrite.prototype._validatePasswordHistory = function () {
}
const user = results[0];
let oldPasswords = [];
if (user._password_history)
{ oldPasswords = _.take(
user._password_history,
this.config.passwordPolicy.maxPasswordHistory - 1
); }
if (user._password_history) {
oldPasswords = _.take(
user._password_history,
this.config.passwordPolicy.maxPasswordHistory - 1
);
}
oldPasswords.push(user.password);
const newPassword = this.data.password;
// compare the new password hash with all old password hashes
const promises = oldPasswords.map(function (hash) {
return passwordCrypto.compare(newPassword, hash).then(result => {
if (result)
// reject if there is a match
{ return Promise.reject('REPEAT_PASSWORD'); }
if (result) {
// reject if there is a match
return Promise.reject('REPEAT_PASSWORD');
}
return Promise.resolve();
});
});
Expand All @@ -900,14 +907,15 @@ RestWrite.prototype._validatePasswordHistory = function () {
return Promise.resolve();
})
.catch(err => {
if (err === 'REPEAT_PASSWORD')
// a match was found
{ return Promise.reject(
new Parse.Error(
Parse.Error.VALIDATION_ERROR,
`New password should not be the same as last ${this.config.passwordPolicy.maxPasswordHistory} passwords.`
)
); }
if (err === 'REPEAT_PASSWORD') {
// a match was found
return Promise.reject(
new Parse.Error(
Parse.Error.VALIDATION_ERROR,
`New password should not be the same as last ${this.config.passwordPolicy.maxPasswordHistory} passwords.`
)
);
}
throw err;
});
});
Expand Down Expand Up @@ -941,10 +949,16 @@ RestWrite.prototype.createSessionTokenIfNeeded = async function () {
// Get verification conditions which can be booleans or functions; the purpose of this async/await
// structure is to avoid unnecessarily executing subsequent functions if previous ones fail in the
// conditional statement below, as a developer may decide to execute expensive operations in them
const verifyUserEmails = async () => this.config.verifyUserEmails === true || (typeof this.config.verifyUserEmails === 'function' && await Promise.resolve(this.config.verifyUserEmails(request)) === true);
const preventLoginWithUnverifiedEmail = async () => this.config.preventLoginWithUnverifiedEmail === true || (typeof this.config.preventLoginWithUnverifiedEmail === 'function' && await Promise.resolve(this.config.preventLoginWithUnverifiedEmail(request)) === true);
const verifyUserEmails = async () =>
this.config.verifyUserEmails === true ||
(typeof this.config.verifyUserEmails === 'function' &&
(await Promise.resolve(this.config.verifyUserEmails(request))) === true);
const preventLoginWithUnverifiedEmail = async () =>
this.config.preventLoginWithUnverifiedEmail === true ||
(typeof this.config.preventLoginWithUnverifiedEmail === 'function' &&
(await Promise.resolve(this.config.preventLoginWithUnverifiedEmail(request))) === true);
// If verification is required
if (await verifyUserEmails() && await preventLoginWithUnverifiedEmail()) {
if ((await verifyUserEmails()) && (await preventLoginWithUnverifiedEmail())) {
this.storage.rejectSignup = true;
return;
}
Expand Down Expand Up @@ -1436,6 +1450,23 @@ RestWrite.prototype.runDatabaseOperation = function () {
`Cannot modify user ${this.query.objectId}.`
);
}
// Handle authData updates for _User class
if (
this.className === '_User' &&
this.query &&
this.data &&
Object.prototype.hasOwnProperty.call(this.data, 'authData')
) {
if (!this.auth.isMaster && !this.auth.isMaintenance) {
// For non-master key requests, remove authData from the update
delete this.data.authData;
// If no other fields to update, return early
if (Object.keys(this.data).length === 0) {
this.response = { response: {} };
return Promise.resolve();
}
}
}

if (this.className === '_Product' && this.data.download) {
this.data.downloadName = this.data.download.name;
Expand Down Expand Up @@ -1746,7 +1777,9 @@ RestWrite.prototype.buildParseObjects = function () {
}
let curObj = parentVal;
for (let i = 1; i < splittedKey.length - 1; i++) {
if (typeof curObj[splittedKey[i]] === 'undefined') curObj[splittedKey[i]] = {};
if (typeof curObj[splittedKey[i]] === 'undefined') {
curObj[splittedKey[i]] = {};
}
curObj = curObj[splittedKey[i]];
}
curObj[splittedKey[splittedKey.length - 1]] = data[key];
Expand Down
Loading