DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix style error

This commit is contained in:
Julia Johannesen 2024-11-20 20:24:59 -05:00
parent 1758f29364
commit 23c4aa2571
No known key found for this signature in database
GPG Key ID: 4A1377AF3E7FBC46
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/backend/src/core/HttpRequestService.ts
View File

@ -54,19 +54,19 @@ class HttpRequestServiceAgent extends http.Agent {
} }
}); });
return socket; return socket;
}; }
@bindThis @bindThis
private isPrivateIp(ip: string): boolean { private isPrivateIp(ip: string): boolean {
const parsedIp = ipaddr.parse(ip); const parsedIp = ipaddr.parse(ip);
for (const net of this.config.allowedPrivateNetworks ?? []) { for (const net of this.config.allowedPrivateNetworks ?? []) {
const cidr = ipaddr.parseCIDR(net); const cidr = ipaddr.parseCIDR(net);
if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) { if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
return false; return false;
} }
} }
return parsedIp.range() !== 'unicast'; return parsedIp.range() !== 'unicast';
} }
} }
@ -98,14 +98,14 @@ class HttpsRequestServiceAgent extends https.Agent {
@bindThis @bindThis
private isPrivateIp(ip: string): boolean { private isPrivateIp(ip: string): boolean {
const parsedIp = ipaddr.parse(ip); const parsedIp = ipaddr.parse(ip);
for (const net of this.config.allowedPrivateNetworks ?? []) { for (const net of this.config.allowedPrivateNetworks ?? []) {
const cidr = ipaddr.parseCIDR(net); const cidr = ipaddr.parseCIDR(net);
if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) { if (cidr[0].kind() === parsedIp.kind() && parsedIp.match(ipaddr.parseCIDR(net))) {
return false; return false;
} }
} }
return parsedIp.range() !== 'unicast'; return parsedIp.range() !== 'unicast';
} }
} }

3
packages/backend/src/queue/processors/InboxProcessorService.ts
View File

@ -192,8 +192,7 @@ export class InboxProcessorService implements OnApplicationShutdown {
if (signerHost !== activityIdHost) { if (signerHost !== activityIdHost) {
throw new Bull.UnrecoverableError(`skip: signerHost(${signerHost}) !== activity.id host(${activityIdHost}`); throw new Bull.UnrecoverableError(`skip: signerHost(${signerHost}) !== activity.id host(${activityIdHost}`);
} }
} } else {
else {
throw new Bull.UnrecoverableError('skip: activity id is not a string'); throw new Bull.UnrecoverableError('skip: activity id is not a string');
} }