johan/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Projects Releases Packages Wiki Activity

server: encode non-ascii domains in punycode in matchHost

Browse source
This commit is contained in:
Norm 2022-12-01 11:34:11 -05:00
parent 075e251822
commit a35c98bbd5
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/backend/src/misc/skipped-instances.ts
View file

@ -1,3 +1,4 @@
import { toASCII } from 'punycode/';
import { db } from '@/db/postgre.js'; import { db } from '@/db/postgre.js';
import { fetchMeta } from '@/misc/fetch-meta.js'; import { fetchMeta } from '@/misc/fetch-meta.js';
import { Instance } from '@/models/entities/instance.js'; import { Instance } from '@/models/entities/instance.js';
@ -9,17 +10,19 @@ const deadThreshold = 7 * DAY;
/** /**
* Returns whether a given host matches a wildcard pattern. * Returns whether a given host matches a wildcard pattern.
* @param host punycoded instance host * @param host instance host
* @param pattern wildcard pattern containing a punycoded instance host * @param pattern wildcard pattern containing an instance host
* @returns whether the post matches the pattern * @returns whether the post matches the pattern
*/ */
function matchHost(host: Instance['host'], pattern: string): boolean { function matchHost(host: Instance['host'], pattern: string): boolean {
// Escape all of the regex special characters. Pattern from: // Escape all of the regex special characters. Pattern from:
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
const escape = (str: string): string => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); const escape = (str: string): string => str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
const re = new RegExp('^' + pattern.split('*').map(toASCII).map(escape).join('.*') + '$');
const re = new RegExp('^' + pattern.split('*').map(escape).join('.*') + '$');
return re.test(host); // Encode the domain in punycode in case it uses non-ascii
const punycoded = toASCII(host);
return re.test(punycoded);
} }
/** /**
@ -53,7 +56,7 @@ export async function skippedInstances(hosts: Array<Instance['host']>): Promise<
deadTime.toISOString(), deadTime.toISOString(),
// don't check hosts again that we already know are suspended // don't check hosts again that we already know are suspended
// also avoids adding duplicates to the list // also avoids adding duplicates to the list
hosts.filter(host => !skipped.some(blockedHost => matchHost(host, blockedHost)) && !host.includes(',')).join(','), hosts.filter(host => !skipped.includes(host) && !host.includes(',')).join(','),
], ],
) )
.then(res => res.map(row => row.host)), .then(res => res.map(row => row.host)),