From e26dc0cdbda13f8b65ab2be3a0e13e7ef5c4b98c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 3 Dec 2020 16:12:58 +0100 Subject: [PATCH] Strict actor url comparison --- server/lib/activitypub/actor.ts | 2 +- server/tests/api/live/live-permanent.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts index 63975021c..fb5558ff6 100644 --- a/server/lib/activitypub/actor.ts +++ b/server/lib/activitypub/actor.ts @@ -403,7 +403,7 @@ function saveActorAndServerAndModelIfNotExist ( // Try to fix non HTTPS accounts of remote instances that fixed their URL afterwards if (created !== true && actorCreated.url !== actor.url) { // Only fix http://example.com/account/djidane to https://example.com/account/djidane - if (actorCreated.url.replace('http://', '') !== actor.url.replace('https://', '')) { + if (actorCreated.url.replace(/^http:\/\//, '') !== actor.url.replace(/^https:\/\//, '')) { throw new Error(`Actor from DB with URL ${actorCreated.url} does not correspond to actor ${actor.url}`) } diff --git a/server/tests/api/live/live-permanent.ts b/server/tests/api/live/live-permanent.ts index a64588ed7..54e4010e9 100644 --- a/server/tests/api/live/live-permanent.ts +++ b/server/tests/api/live/live-permanent.ts @@ -4,7 +4,6 @@ import 'mocha' import * as chai from 'chai' import { LiveVideoCreate, VideoDetails, VideoPrivacy, VideoState } from '@shared/models' import { - checkLiveCleanup, cleanupTests, createLive, doubleFollow,