hotfix: fixed critical scope validation bug for 4.x

Merge pull request #229 from jorenvandeweyer/bugfix/validate-scope-4.x
node-oauth · Aug 26, 2023 · 25c3661 · 25c3661
2 parents 5e4f552 + d2086b0
commit 25c3661
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 66 deletions.
diff --git a/lib/grant-types/abstract-grant-type.js b/lib/grant-types/abstract-grant-type.js
@@ -93,18 +93,18 @@ AbstractGrantType.prototype.getScope = function(request) {
 /**
  * Validate requested scope.
  */
-AbstractGrantType.prototype.validateScope = function(user, client, scope) {
+AbstractGrantType.prototype.validateScope = function(user, client, requestedScoped) {
   if (this.model.validateScope) {
-    return promisify(this.model.validateScope, 3).call(this.model, user, client, scope)
-      .then(function (scope) {
-        if (!scope) {
+    return promisify(this.model.validateScope, 3).call(this.model, user, client, requestedScoped)
+      .then(function (validatedScope) {
+        if (!validatedScope) {
           throw new InvalidScopeError('Invalid scope: Requested scope is invalid');
         }
 
-        return scope;
+        return validatedScope;
       });
   } else {
-    return scope;
+    return requestedScoped;
   }
 };
 

diff --git a/lib/grant-types/authorization-code-grant-type.js b/lib/grant-types/authorization-code-grant-type.js
@@ -205,28 +205,31 @@ AuthorizationCodeGrantType.prototype.revokeAuthorizationCode = function(code) {
  * Save token.
  */
 
-AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, scope) {
-  const fns = [
-    this.validateScope(user, client, scope),
-    this.generateAccessToken(client, user, scope),
-    this.generateRefreshToken(client, user, scope),
-    this.getAccessTokenExpiresAt(),
-    this.getRefreshTokenExpiresAt()
-  ];
-
-  return Promise.all(fns)
-    .bind(this)
-    .spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
-      const token = {
-        accessToken: accessToken,
-        authorizationCode: authorizationCode,
-        accessTokenExpiresAt: accessTokenExpiresAt,
-        refreshToken: refreshToken,
-        refreshTokenExpiresAt: refreshTokenExpiresAt,
-        scope: scope
-      };
-
-      return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, requestedScope) {
+  return Promise.bind(this)
+    .then(function() {
+      return this.validateScope(user, client, requestedScope);
+    })
+    .then(function(validatedScoped) {
+      return Promise.all([
+        this.generateAccessToken(client, user, validatedScoped),
+        this.generateRefreshToken(client, user, validatedScoped),
+        this.getAccessTokenExpiresAt(),
+        this.getRefreshTokenExpiresAt()
+      ])
+        .bind(this)
+        .spread(function(accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
+          const token = {
+            accessToken: accessToken,
+            authorizationCode: authorizationCode,
+            accessTokenExpiresAt: accessTokenExpiresAt,
+            refreshToken: refreshToken,
+            refreshTokenExpiresAt: refreshTokenExpiresAt,
+            scope: validatedScoped
+          };
+
+          return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+        });
     });
 };
 

diff --git a/lib/grant-types/client-credentials-grant-type.js b/lib/grant-types/client-credentials-grant-type.js
@@ -84,23 +84,26 @@ ClientCredentialsGrantType.prototype.getUserFromClient = function(client) {
  * Save token.
  */
 
-ClientCredentialsGrantType.prototype.saveToken = function(user, client, scope) {
-  const fns = [
-    this.validateScope(user, client, scope),
-    this.generateAccessToken(client, user, scope),
-    this.getAccessTokenExpiresAt(client, user, scope)
-  ];
-
-  return Promise.all(fns)
-    .bind(this)
-    .spread(function(scope, accessToken, accessTokenExpiresAt) {
-      const token = {
-        accessToken: accessToken,
-        accessTokenExpiresAt: accessTokenExpiresAt,
-        scope: scope
-      };
-
-      return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+ClientCredentialsGrantType.prototype.saveToken = function(user, client, requestedScope) {
+  return Promise.bind(this)
+    .then(function() {
+      return this.validateScope(user, client, requestedScope);
+    })
+    .then(function(validatedScope) {
+      return Promise.all([
+        this.generateAccessToken(client, user, validatedScope),
+        this.getAccessTokenExpiresAt(client, user, validatedScope)
+      ])
+        .bind(this)
+        .spread(function(accessToken, accessTokenExpiresAt) {
+          const token = {
+            accessToken: accessToken,
+            accessTokenExpiresAt: accessTokenExpiresAt,
+            scope: validatedScope
+          };
+
+          return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+        });
     });
 };
 

diff --git a/lib/grant-types/password-grant-type.js b/lib/grant-types/password-grant-type.js
@@ -102,27 +102,30 @@ PasswordGrantType.prototype.getUser = function(request) {
  * Save token.
  */
 
-PasswordGrantType.prototype.saveToken = function(user, client, scope) {
-  const fns = [
-    this.validateScope(user, client, scope),
-    this.generateAccessToken(client, user, scope),
-    this.generateRefreshToken(client, user, scope),
-    this.getAccessTokenExpiresAt(),
-    this.getRefreshTokenExpiresAt()
-  ];
-
-  return Promise.all(fns)
-    .bind(this)
-    .spread(function(scope, accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
-      const token = {
-        accessToken: accessToken,
-        accessTokenExpiresAt: accessTokenExpiresAt,
-        refreshToken: refreshToken,
-        refreshTokenExpiresAt: refreshTokenExpiresAt,
-        scope: scope
-      };
-
-      return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+PasswordGrantType.prototype.saveToken = function(user, client, requestedScope) {
+  return Promise.bind(this)
+    .then(function () {
+      return this.validateScope(user, client,requestedScope);
+    })
+    .then(function(validatedScope) {
+      return Promise.all([
+        this.generateAccessToken(client, user, validatedScope),
+        this.generateRefreshToken(client, user, validatedScope),
+        this.getAccessTokenExpiresAt(),
+        this.getRefreshTokenExpiresAt()
+      ])
+        .bind(this)
+        .spread(function(accessToken, refreshToken, accessTokenExpiresAt, refreshTokenExpiresAt) {
+          const token = {
+            accessToken: accessToken,
+            accessTokenExpiresAt: accessTokenExpiresAt,
+            refreshToken: refreshToken,
+            refreshTokenExpiresAt: refreshTokenExpiresAt,
+            scope: validatedScope
+          };
+
+          return promisify(this.model.saveToken, 3).call(this.model, token, client, user);
+        });
     });
 };