diff --git a/packages/backend/package.json b/packages/backend/package.json index 83c49459b5..e05a787473 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -31,10 +31,10 @@ "@bull-board/ui": "5.8.0", "@discordapp/twemoji": "14.1.2", "@elastic/elasticsearch": "7.17.0", + "@joinfirefish/http-signature": "1.8.3", "@koa/cors": "3.4.3", "@koa/multer": "3.0.2", "@koa/router": "9.0.1", - "@peertube/http-signature": "1.7.0", "@redocly/openapi-core": "1.0.2", "@sinonjs/fake-timers": "9.1.2", "@syuilo/aiscript": "0.11.1", diff --git a/packages/backend/src/@types/http-signature.d.ts b/packages/backend/src/@types/http-signature.d.ts index 3bfece8cbf..4ff20564c3 100644 --- a/packages/backend/src/@types/http-signature.d.ts +++ b/packages/backend/src/@types/http-signature.d.ts @@ -1,4 +1,4 @@ -declare module "@peertube/http-signature" { +declare module "@joinfirefish/http-signature" { import type { IncomingMessage, ClientRequest } from "node:http"; interface ISignature { diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts index 0500737a48..ab0de33243 100644 --- a/packages/backend/src/queue/index.ts +++ b/packages/backend/src/queue/index.ts @@ -1,4 +1,4 @@ -import type httpSignature from "@peertube/http-signature"; +import type httpSignature from "@joinfirefish/http-signature"; import { v4 as uuid } from "uuid"; import config from "@/config/index.js"; diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts index 0e500b89ed..e4ad7ce90c 100644 --- a/packages/backend/src/queue/processors/inbox.ts +++ b/packages/backend/src/queue/processors/inbox.ts @@ -1,6 +1,6 @@ import { URL } from "node:url"; import type Bull from "bull"; -import httpSignature from "@peertube/http-signature"; +import httpSignature from "@joinfirefish/http-signature"; import perform from "@/remote/activitypub/perform.js"; import Logger from "@/services/logger.js"; import { registerOrFetchInstanceDoc } from "@/services/register-or-fetch-instance-doc.js"; diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts index 6383f3fdd5..a70364012f 100644 --- a/packages/backend/src/queue/types.ts +++ b/packages/backend/src/queue/types.ts @@ -3,7 +3,7 @@ import type { Note } from "@/models/entities/note"; import type { User } from "@/models/entities/user.js"; import type { Webhook } from "@/models/entities/webhook"; import type { IActivity } from "@/remote/activitypub/type.js"; -import type httpSignature from "@peertube/http-signature"; +import type httpSignature from "@joinfirefish/http-signature"; export type DeliverJobData = { /** Actor */ diff --git a/packages/backend/src/remote/activitypub/check-fetch.ts b/packages/backend/src/remote/activitypub/check-fetch.ts index c885b4a199..8d9a5e7cc6 100644 --- a/packages/backend/src/remote/activitypub/check-fetch.ts +++ b/packages/backend/src/remote/activitypub/check-fetch.ts @@ -1,5 +1,5 @@ import { URL } from "url"; -import httpSignature from "@peertube/http-signature"; +import httpSignature from "@joinfirefish/http-signature"; import config from "@/config/index.js"; import { fetchMeta } from "@/misc/fetch-meta.js"; import { toPuny } from "@/misc/convert-host.js"; diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts index f9d5eb99c3..eaa1e2c90b 100644 --- a/packages/backend/src/server/activitypub.ts +++ b/packages/backend/src/server/activitypub.ts @@ -1,6 +1,6 @@ import Router from "@koa/router"; import json from "koa-json-body"; -import httpSignature from "@peertube/http-signature"; +import httpSignature from "@joinfirefish/http-signature"; import { In, IsNull, Not } from "typeorm"; import { renderActivity } from "@/remote/activitypub/renderer/index.js"; diff --git a/packages/backend/test/ap-request.ts b/packages/backend/test/ap-request.ts index bf77a38532..ed7f5030fe 100644 --- a/packages/backend/test/ap-request.ts +++ b/packages/backend/test/ap-request.ts @@ -1,5 +1,5 @@ import * as assert from "assert"; -import httpSignature from "@peertube/http-signature"; +import httpSignature from "@joinfirefish/http-signature"; import { genRsaKeyPair } from "../src/misc/gen-key-pair.js"; import { createSignedPost, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 79282ed428..76b00d13db 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -111,6 +111,9 @@ importers: '@elastic/elasticsearch': specifier: 7.17.0 version: 7.17.0 + '@joinfirefish/http-signature': + specifier: 1.8.3 + version: 1.8.3 '@koa/cors': specifier: 3.4.3 version: 3.4.3 @@ -120,9 +123,6 @@ importers: '@koa/router': specifier: 9.0.1 version: 9.0.1 - '@peertube/http-signature': - specifier: 1.7.0 - version: 1.7.0 '@redocly/openapi-core': specifier: 1.0.2 version: 1.0.2 @@ -742,7 +742,7 @@ importers: version: 2.30.0 emojilib: specifier: github:thatonecalculator/emojilib - version: github.com/thatonecalculator/emojilib/d3c8c6a77d4362b3b3180099f1d2eac344ce245c + version: github.com/thatonecalculator/emojilib/c3c82a3c8f360e1ec567c61012b95d23f0d22175 escape-regexp: specifier: 0.0.1 version: 0.0.1 @@ -2740,6 +2740,15 @@ packages: chalk: 4.1.2 dev: true + /@joinfirefish/http-signature@1.8.3: + resolution: {integrity: sha512-x3YOhg1Phq2aTml5n+8jTpBcKKI0ArgL7xNvaBBby6E+is2lHQYHvlzWIHrDsCM9Fu9VtMBCvlqEcjuoA59K0A==} + engines: {node: '>=4.1.6'} + dependencies: + assert-plus: 1.0.0 + jsprim: 2.0.2 + sshpk: 1.17.0 + dev: false + /@jridgewell/gen-mapping@0.3.3: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} @@ -3039,15 +3048,6 @@ packages: /@one-ini/wasm@0.1.1: resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} - /@peertube/http-signature@1.7.0: - resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==} - engines: {node: '>=0.10'} - dependencies: - assert-plus: 1.0.0 - jsprim: 1.4.2 - sshpk: 1.17.0 - dev: false - /@phc/format@1.0.0: resolution: {integrity: sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==} engines: {node: '>=10'} @@ -12891,7 +12891,6 @@ packages: extsprintf: 1.3.0 json-schema: 0.4.0 verror: 1.10.0 - dev: true /jsrsasign@10.8.6: resolution: {integrity: sha512-bQmbVtsfbgaKBTWCKiDCPlUPbdlRIK/FzSwT3BzIgZl/cU6TqXu6pZJsCI/dJVrZ9Gir5GC4woqw9shH/v7MBw==} @@ -19461,8 +19460,8 @@ packages: url-polyfill: 1.1.12 dev: true - github.com/thatonecalculator/emojilib/d3c8c6a77d4362b3b3180099f1d2eac344ce245c: - resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/d3c8c6a77d4362b3b3180099f1d2eac344ce245c} + github.com/thatonecalculator/emojilib/c3c82a3c8f360e1ec567c61012b95d23f0d22175: + resolution: {tarball: https://codeload.github.com/thatonecalculator/emojilib/tar.gz/c3c82a3c8f360e1ec567c61012b95d23f0d22175} name: emojilib version: 3.0.10 dev: true