natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use http-signature module that supports hs2019 (#8635)

This commit is contained in:
Johann150 2022-05-26 02:12:17 +02:00 committed by GitHub
parent b3ad04fcb0
commit 9c80403072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/backend/package.json
View File

@ -20,6 +20,7 @@
"@koa/cors": "3.1.0", "@koa/cors": "3.1.0",
"@koa/multer": "3.0.0", "@koa/multer": "3.0.0",
"@koa/router": "9.0.1", "@koa/router": "9.0.1",
"@peertube/http-signature": "1.6.0",
"@sinonjs/fake-timers": "9.1.2", "@sinonjs/fake-timers": "9.1.2",
"@syuilo/aiscript": "0.11.1", "@syuilo/aiscript": "0.11.1",
"abort-controller": "3.0.0", "abort-controller": "3.0.0",
@ -47,7 +48,6 @@
"fluent-ffmpeg": "2.1.2", "fluent-ffmpeg": "2.1.2",
"got": "12.0.4", "got": "12.0.4",
"hpagent": "0.1.2", "hpagent": "0.1.2",
"http-signature": "1.3.6",
"ip-cidr": "3.0.8", "ip-cidr": "3.0.8",
"is-svg": "4.3.2", "is-svg": "4.3.2",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",

2
packages/backend/src/@types/http-signature.d.ts vendored
View File

@ -1,4 +1,4 @@
declare module 'http-signature' { declare module '@peertube/http-signature' {
import { IncomingMessage, ClientRequest } from 'node:http'; import { IncomingMessage, ClientRequest } from 'node:http';
interface ISignature { interface ISignature {

2
packages/backend/src/queue/index.ts
View File

@ -1,4 +1,4 @@
import httpSignature from 'http-signature'; import httpSignature from '@peertube/http-signature';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import config from '@/config/index.js'; import config from '@/config/index.js';

2
packages/backend/src/queue/processors/inbox.ts
View File

@ -1,6 +1,6 @@
import { URL } from 'node:url'; import { URL } from 'node:url';
import Bull from 'bull'; import Bull from 'bull';
import httpSignature from 'http-signature'; import httpSignature from '@peertube/http-signature';
import perform from '@/remote/activitypub/perform.js'; import perform from '@/remote/activitypub/perform.js';
import Logger from '@/services/logger.js'; import Logger from '@/services/logger.js';
import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc.js'; import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc.js';

2
packages/backend/src/queue/types.ts
View File

@ -3,7 +3,7 @@ import { Note } from '@/models/entities/note';
import { User } from '@/models/entities/user.js'; import { User } from '@/models/entities/user.js';
import { Webhook } from '@/models/entities/webhook'; import { Webhook } from '@/models/entities/webhook';
import { IActivity } from '@/remote/activitypub/type.js'; import { IActivity } from '@/remote/activitypub/type.js';
import httpSignature from 'http-signature'; import httpSignature from '@peertube/http-signature';
export type DeliverJobData = { export type DeliverJobData = {
/** Actor */ /** Actor */

2
packages/backend/src/server/activitypub.ts
View File

@ -1,6 +1,6 @@
import Router from '@koa/router'; import Router from '@koa/router';
import json from 'koa-json-body'; import json from 'koa-json-body';
import httpSignature from 'http-signature'; import httpSignature from '@peertube/http-signature';
import { renderActivity } from '@/remote/activitypub/renderer/index.js'; import { renderActivity } from '@/remote/activitypub/renderer/index.js';
import renderNote from '@/remote/activitypub/renderer/note.js'; import renderNote from '@/remote/activitypub/renderer/note.js';

26
packages/backend/yarn.lock
View File

@ -247,6 +247,15 @@
mkdirp "^1.0.4" mkdirp "^1.0.4"
rimraf "^3.0.2" rimraf "^3.0.2"
"@peertube/http-signature@1.6.0":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@peertube/http-signature/-/http-signature-1.6.0.tgz#22bef028384e6437e8dbd94052ba7b8bd7f7f1ae"
integrity sha512-Bx780c7FPYtkV4LgCoaJcXYcKQqaMef2iQR2V2r5klkYkIQWFxbTOpyhKxvVXYIBIFpj5Cb8DGVDAmhkm7aavg==
dependencies:
assert-plus "^1.0.0"
jsprim "^1.2.2"
sshpk "^1.14.1"
"@redocly/ajv@^8.6.4": "@redocly/ajv@^8.6.4":
version "8.6.4" version "8.6.4"
resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.4.tgz#94053e7a9d4146d1a4feacd3813892873f229a85" resolved "https://registry.yarnpkg.com/@redocly/ajv/-/ajv-8.6.4.tgz#94053e7a9d4146d1a4feacd3813892873f229a85"
@ -3465,15 +3474,6 @@ http-proxy-agent@^5.0.0:
agent-base "6" agent-base "6"
debug "4" debug "4"
http-signature@1.3.6:
version "1.3.6"
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
dependencies:
assert-plus "^1.0.0"
jsprim "^2.0.2"
sshpk "^1.14.1"
http2-wrapper@^1.0.0-beta.5.0: http2-wrapper@^1.0.0-beta.5.0:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
@ -4103,10 +4103,10 @@ jsonld@5.2.0:
lru-cache "^6.0.0" lru-cache "^6.0.0"
rdf-canonize "^3.0.0" rdf-canonize "^3.0.0"
jsprim@^2.0.2: jsprim@^1.2.2:
version "2.0.2" version "1.4.2"
resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ== integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
dependencies: dependencies:
assert-plus "1.0.0" assert-plus "1.0.0"
extsprintf "1.3.0" extsprintf "1.3.0"