fix "federation allowed" check in our code
This commit is contained in:
parent
f68c0ac05d
commit
98f1f30e72
2 changed files with 2 additions and 2 deletions
|
@ -173,7 +173,7 @@ export class ActivityPubServerService {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.utilityService.isFederationAllowedHost(keyHost)) {
|
if (!this.utilityService.isFederationAllowedHost(keyHost)) {
|
||||||
/* blocked instance: refuse (we don't care if the signature is
|
/* blocked instance: refuse (we don't care if the signature is
|
||||||
good, if they even pretend to be from a blocked instance,
|
good, if they even pretend to be from a blocked instance,
|
||||||
they're out) */
|
they're out) */
|
||||||
|
|
|
@ -156,7 +156,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
if (note.user?.isSilenced && me && followings && note.userId !== me.id && !followings[note.userId]) return false;
|
if (note.user?.isSilenced && me && followings && note.userId !== me.id && !followings[note.userId]) return false;
|
||||||
if (note.user?.isSuspended) return false;
|
if (note.user?.isSuspended) return false;
|
||||||
if (note.userHost) {
|
if (note.userHost) {
|
||||||
if (this.utilityService.isFederationAllowedHost(note.userHost)) return false;
|
if (!this.utilityService.isFederationAllowedHost(note.userHost)) return false;
|
||||||
if (this.utilityService.isSilencedHost(this.serverSettings.silencedHosts, note.userHost)) return false;
|
if (this.utilityService.isSilencedHost(this.serverSettings.silencedHosts, note.userHost)) return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue