From 395676f19dc677c175ba3ef5ab4f6449041a88f3 Mon Sep 17 00:00:00 2001 From: Nathan Byrd Date: Mon, 2 Jan 2023 15:20:24 -0600 Subject: [PATCH] accountStatus cannot both be inactive and disabled, changed to or condition. Also removed outdated comment. --- core/servers/content/web_handlers/webfinger.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/servers/content/web_handlers/webfinger.js b/core/servers/content/web_handlers/webfinger.js index 9232c516..7ba9a959 100644 --- a/core/servers/content/web_handlers/webfinger.js +++ b/core/servers/content/web_handlers/webfinger.js @@ -97,7 +97,6 @@ exports.getModule = class WebFingerServerModule extends WebHandlerModule { ); } - // TODO: Handle URL escaped @ sign as well const userPosition = resource.indexOf('@'); if (-1 == userPosition || userPosition == resource.length - 1) { this._notFound(resp); @@ -314,10 +313,7 @@ Achievement Points: %ACHIEVEMENT_POINTS%`, } const accountStatus = user.getPropertyAsNumber(UserProps.AccountStatus); - if ( - User.AccountStatus.disabled == accountStatus && - User.AccountStatus.inactive == accountStatus - ) { + if (User.AccountStatus.disabled == accountStatus || User.AccountStatus.inactive == accountStatus) { this._notFound(resp); return cb( Errors.AccessDenied('Account disabled', ErrorReasons.Disabled)