From 4884bd126417a592d70e902b06e012e9e2f4becf Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Tue, 25 Apr 2023 09:50:42 +0200 Subject: [PATCH] OAuth server: generate GitHub-style tokens (#12617) * Add `base-x` and `crc-32` dependencies * OAuth server: generate GitHub-style tokens GitOrigin-RevId: c128742a37d53f1902ccfaf75fa1c5ca5adfdbf2 --- package-lock.json | 63 +++++++++++++-------------------------- services/web/package.json | 2 ++ 2 files changed, 22 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 95156e3b87..7356f91c8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11260,6 +11260,11 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "node_modules/base-x": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" + }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -13535,13 +13540,9 @@ } }, "node_modules/crc-32": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz", - "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==", - "dependencies": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.3.1" - }, + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", "bin": { "crc32": "bin/crc32.njs" }, @@ -16243,14 +16244,6 @@ "node": ">= 0.8.0" } }, - "node_modules/exit-on-epipe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", - "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==", - "engines": { - "node": ">=0.8" - } - }, "node_modules/expand-range": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", @@ -26465,17 +26458,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/printj": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz", - "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==", - "bin": { - "printj": "bin/printj.njs" - }, - "engines": { - "node": ">=0.8" - } - }, "node_modules/process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -35243,6 +35225,7 @@ "archiver": "^5.3.0", "async": "3.2.2", "backbone": "^1.3.3", + "base-x": "^4.0.0", "basic-auth": "^2.0.1", "bcrypt": "^5.0.0", "body-parser": "^1.19.0", @@ -35263,6 +35246,7 @@ "cookie": "^0.2.3", "cookie-parser": "1.3.5", "core-js": "^3.6.2", + "crc-32": "^1.2.2", "crypto-js": "^3.1.9-1", "csurf": "^1.11.0", "csv": "^6.2.5", @@ -44949,6 +44933,7 @@ "babel-plugin-angularjs-annotate": "^0.10.0", "babel-plugin-macros": "^3.1.0", "backbone": "^1.3.3", + "base-x": "^4.0.0", "basic-auth": "^2.0.1", "bcrypt": "^5.0.0", "body-parser": "^1.19.0", @@ -44976,6 +44961,7 @@ "cookie-parser": "1.3.5", "copy-webpack-plugin": "^10.2.4", "core-js": "^3.6.2", + "crc-32": "*", "crypto-js": "^3.1.9-1", "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^3.4.1", @@ -49605,6 +49591,11 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, + "base-x": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz", + "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==" + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -51416,13 +51407,9 @@ } }, "crc-32": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz", - "integrity": "sha512-Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==", - "requires": { - "exit-on-epipe": "~1.0.1", - "printj": "~1.3.1" - } + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==" }, "crelt": { "version": "1.0.5", @@ -53513,11 +53500,6 @@ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=" }, - "exit-on-epipe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz", - "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==" - }, "expand-range": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", @@ -61769,11 +61751,6 @@ "parse-ms": "^2.1.0" } }, - "printj": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz", - "integrity": "sha512-GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==" - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", diff --git a/services/web/package.json b/services/web/package.json index 270488449c..65f7bf65eb 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -130,6 +130,7 @@ "archiver": "^5.3.0", "async": "3.2.2", "backbone": "^1.3.3", + "base-x": "^4.0.0", "basic-auth": "^2.0.1", "bcrypt": "^5.0.0", "body-parser": "^1.19.0", @@ -150,6 +151,7 @@ "cookie": "^0.2.3", "cookie-parser": "1.3.5", "core-js": "^3.6.2", + "crc-32": "^1.2.2", "crypto-js": "^3.1.9-1", "csurf": "^1.11.0", "csv": "^6.2.5",