diff --git a/package.json b/package.json index 57f582e26..e62c256b6 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ }, "dependencies": { "@aws-sdk/client-s3": "^3.23.0", + "@peertube/http-signature": "^1.4.0", "@uploadx/core": "^4.4.0", "async": "^3.0.1", "async-lru": "^1.1.1", @@ -102,7 +103,6 @@ "helmet": "^4.1.0", "hpagent": "^0.1.2", "http-problem-details": "^0.1.5", - "http-signature": "1.3.5", "ip-anonymize": "^0.1.0", "ipaddr.js": "2.0.1", "is-cidr": "^4.0.0", @@ -196,7 +196,6 @@ "eslint-plugin-import": "^2.20.1", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": "^5.1.0", - "eslint-plugin-standard": "^5.0.0", "fast-xml-parser": "^3.19.0", "maildev": "^1.0.0-rc3", "mocha": "^9.0.0", diff --git a/server/helpers/peertube-crypto.ts b/server/helpers/peertube-crypto.ts index 66060bde2..44d90d9f1 100644 --- a/server/helpers/peertube-crypto.ts +++ b/server/helpers/peertube-crypto.ts @@ -12,7 +12,7 @@ const bcryptComparePromise = promisify2(compare) const bcryptGenSaltPromise = promisify1(genSalt) const bcryptHashPromise = promisify2(hash) -const httpSignature = require('http-signature') +const httpSignature = require('@peertube/http-signature') async function createPrivateAndPublicKeys () { logger.info('Generating a RSA key...') diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts index d93f55776..799034b90 100644 --- a/server/helpers/requests.ts +++ b/server/helpers/requests.ts @@ -9,7 +9,7 @@ import { processImage } from './image-utils' import { logger } from './logger' import { getProxy, isProxyEnabled } from './proxy' -const httpSignature = require('http-signature') +const httpSignature = require('@peertube/http-signature') export interface PeerTubeRequestError extends Error { statusCode?: number diff --git a/yarn.lock b/yarn.lock index 2a0bcae23..6c9a879e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1280,6 +1280,15 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@peertube/http-signature@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@peertube/http-signature/-/http-signature-1.4.0.tgz#5d2bab08dfeca55490d926d145b3ec0cfb392d63" + integrity sha512-x7vhu+sFCOtf0jI3u0aN3DA+t6+WoRu3Mm3bAgh1xOAOF2Dr5FcAV25oUI2rPejv8IgPCXiFL6wlCFn8ND5pvg== + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.14.1" + "@selderee/plugin-htmlparser2@^0.6.0": version "0.6.0" resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz#27e994afd1c2cb647ceb5406a185a5574188069d" @@ -3841,11 +3850,6 @@ eslint-plugin-promise@^5.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== -eslint-plugin-standard@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4" - integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== - eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" @@ -4765,15 +4769,6 @@ http-problem-details@^0.1.5: resolved "https://registry.yarnpkg.com/http-problem-details/-/http-problem-details-0.1.5.tgz#f8f94f4ab9d4050749e9f8566fb85bb8caa2be56" integrity sha512-GHxfQZ0POP4FWbAM0guOyZyJNWwbLUXp+4XOJdmitS2tp3gHVSatrSX59Yyq/dCkhk4KiGtTWIlXZC83yCkBkA== -http-signature@1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.5.tgz#9f19496ffbf3227298d7b5f156e0e1a948678683" - integrity sha512-NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw== - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.14.1" - http2-wrapper@^1.0.0-beta.5.2: version "1.0.3" resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"