diff options
-rw-r--r-- | package.json | 3 | ||||
-rw-r--r-- | server/helpers/peertube-crypto.ts | 2 | ||||
-rw-r--r-- | server/helpers/requests.ts | 2 | ||||
-rw-r--r-- | yarn.lock | 23 |
4 files changed, 12 insertions, 18 deletions
diff --git a/package.json b/package.json index 57f582e26..e62c256b6 100644 --- a/package.json +++ b/package.json | |||
@@ -73,6 +73,7 @@ | |||
73 | }, | 73 | }, |
74 | "dependencies": { | 74 | "dependencies": { |
75 | "@aws-sdk/client-s3": "^3.23.0", | 75 | "@aws-sdk/client-s3": "^3.23.0", |
76 | "@peertube/http-signature": "^1.4.0", | ||
76 | "@uploadx/core": "^4.4.0", | 77 | "@uploadx/core": "^4.4.0", |
77 | "async": "^3.0.1", | 78 | "async": "^3.0.1", |
78 | "async-lru": "^1.1.1", | 79 | "async-lru": "^1.1.1", |
@@ -102,7 +103,6 @@ | |||
102 | "helmet": "^4.1.0", | 103 | "helmet": "^4.1.0", |
103 | "hpagent": "^0.1.2", | 104 | "hpagent": "^0.1.2", |
104 | "http-problem-details": "^0.1.5", | 105 | "http-problem-details": "^0.1.5", |
105 | "http-signature": "1.3.5", | ||
106 | "ip-anonymize": "^0.1.0", | 106 | "ip-anonymize": "^0.1.0", |
107 | "ipaddr.js": "2.0.1", | 107 | "ipaddr.js": "2.0.1", |
108 | "is-cidr": "^4.0.0", | 108 | "is-cidr": "^4.0.0", |
@@ -196,7 +196,6 @@ | |||
196 | "eslint-plugin-import": "^2.20.1", | 196 | "eslint-plugin-import": "^2.20.1", |
197 | "eslint-plugin-node": "^11.0.0", | 197 | "eslint-plugin-node": "^11.0.0", |
198 | "eslint-plugin-promise": "^5.1.0", | 198 | "eslint-plugin-promise": "^5.1.0", |
199 | "eslint-plugin-standard": "^5.0.0", | ||
200 | "fast-xml-parser": "^3.19.0", | 199 | "fast-xml-parser": "^3.19.0", |
201 | "maildev": "^1.0.0-rc3", | 200 | "maildev": "^1.0.0-rc3", |
202 | "mocha": "^9.0.0", | 201 | "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<any, string, boolean>(compare) | |||
12 | const bcryptGenSaltPromise = promisify1<number, string>(genSalt) | 12 | const bcryptGenSaltPromise = promisify1<number, string>(genSalt) |
13 | const bcryptHashPromise = promisify2<any, string | number, string>(hash) | 13 | const bcryptHashPromise = promisify2<any, string | number, string>(hash) |
14 | 14 | ||
15 | const httpSignature = require('http-signature') | 15 | const httpSignature = require('@peertube/http-signature') |
16 | 16 | ||
17 | async function createPrivateAndPublicKeys () { | 17 | async function createPrivateAndPublicKeys () { |
18 | logger.info('Generating a RSA key...') | 18 | 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' | |||
9 | import { logger } from './logger' | 9 | import { logger } from './logger' |
10 | import { getProxy, isProxyEnabled } from './proxy' | 10 | import { getProxy, isProxyEnabled } from './proxy' |
11 | 11 | ||
12 | const httpSignature = require('http-signature') | 12 | const httpSignature = require('@peertube/http-signature') |
13 | 13 | ||
14 | export interface PeerTubeRequestError extends Error { | 14 | export interface PeerTubeRequestError extends Error { |
15 | statusCode?: number | 15 | statusCode?: number |
@@ -1280,6 +1280,15 @@ | |||
1280 | "@nodelib/fs.scandir" "2.1.5" | 1280 | "@nodelib/fs.scandir" "2.1.5" |
1281 | fastq "^1.6.0" | 1281 | fastq "^1.6.0" |
1282 | 1282 | ||
1283 | "@peertube/http-signature@^1.4.0": | ||
1284 | version "1.4.0" | ||
1285 | resolved "https://registry.yarnpkg.com/@peertube/http-signature/-/http-signature-1.4.0.tgz#5d2bab08dfeca55490d926d145b3ec0cfb392d63" | ||
1286 | integrity sha512-x7vhu+sFCOtf0jI3u0aN3DA+t6+WoRu3Mm3bAgh1xOAOF2Dr5FcAV25oUI2rPejv8IgPCXiFL6wlCFn8ND5pvg== | ||
1287 | dependencies: | ||
1288 | assert-plus "^1.0.0" | ||
1289 | jsprim "^1.2.2" | ||
1290 | sshpk "^1.14.1" | ||
1291 | |||
1283 | "@selderee/plugin-htmlparser2@^0.6.0": | 1292 | "@selderee/plugin-htmlparser2@^0.6.0": |
1284 | version "0.6.0" | 1293 | version "0.6.0" |
1285 | resolved "https://registry.yarnpkg.com/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz#27e994afd1c2cb647ceb5406a185a5574188069d" | 1294 | 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: | |||
3841 | resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" | 3850 | resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" |
3842 | integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== | 3851 | integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== |
3843 | 3852 | ||
3844 | eslint-plugin-standard@^5.0.0: | ||
3845 | version "5.0.0" | ||
3846 | resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4" | ||
3847 | integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== | ||
3848 | |||
3849 | eslint-scope@^5.1.1: | 3853 | eslint-scope@^5.1.1: |
3850 | version "5.1.1" | 3854 | version "5.1.1" |
3851 | resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" | 3855 | resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" |
@@ -4765,15 +4769,6 @@ http-problem-details@^0.1.5: | |||
4765 | resolved "https://registry.yarnpkg.com/http-problem-details/-/http-problem-details-0.1.5.tgz#f8f94f4ab9d4050749e9f8566fb85bb8caa2be56" | 4769 | resolved "https://registry.yarnpkg.com/http-problem-details/-/http-problem-details-0.1.5.tgz#f8f94f4ab9d4050749e9f8566fb85bb8caa2be56" |
4766 | integrity sha512-GHxfQZ0POP4FWbAM0guOyZyJNWwbLUXp+4XOJdmitS2tp3gHVSatrSX59Yyq/dCkhk4KiGtTWIlXZC83yCkBkA== | 4770 | integrity sha512-GHxfQZ0POP4FWbAM0guOyZyJNWwbLUXp+4XOJdmitS2tp3gHVSatrSX59Yyq/dCkhk4KiGtTWIlXZC83yCkBkA== |
4767 | 4771 | ||
4768 | http-signature@1.3.5: | ||
4769 | version "1.3.5" | ||
4770 | resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.5.tgz#9f19496ffbf3227298d7b5f156e0e1a948678683" | ||
4771 | integrity sha512-NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw== | ||
4772 | dependencies: | ||
4773 | assert-plus "^1.0.0" | ||
4774 | jsprim "^1.2.2" | ||
4775 | sshpk "^1.14.1" | ||
4776 | |||
4777 | http2-wrapper@^1.0.0-beta.5.2: | 4772 | http2-wrapper@^1.0.0-beta.5.2: |
4778 | version "1.0.3" | 4773 | version "1.0.3" |
4779 | resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" | 4774 | resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" |