diff --git a/Build/build-microsoft-cdn.ts b/Build/build-microsoft-cdn.ts index 591a95bc..68ec5df7 100644 --- a/Build/build-microsoft-cdn.ts +++ b/Build/build-microsoft-cdn.ts @@ -3,10 +3,11 @@ import { SHARED_DESCRIPTION } from './constants/description'; import { once } from 'foxts/once'; import { RulesetOutput } from './lib/rules/ruleset'; import Worktank from 'worktank'; +import { RULES } from './constants/microsoft-cdn'; const pool = new Worktank({ pool: { - name: 'build-internal-reverse-chn-cidr', + name: 'get-microsoft-cdn', size: 1 // The number of workers to keep in the pool, if more workers are needed they will be spawned up to this limit }, worker: { @@ -16,7 +17,7 @@ const pool = new Worktank({ methods: { // eslint-disable-next-line object-shorthand -- workertank getMicrosoftCdnRuleset: async function (importMetaUrl: string): Promise<[domains: string[], domainSuffixes: string[]]> { - // TODO: createRequire is a temporary workaround for https://github.com/nodejs/node/issues/51956 + // TODO: createRequire is a temporary workaround for https://github.com/nodejs/node/issues/51956 const { default: module } = await import('node:module'); const __require = module.createRequire(importMetaUrl); @@ -67,6 +68,7 @@ export const buildMicrosoftCdn = task(require.main === module, __filename)(async '', 'This file contains Microsoft\'s domains using their China mainland CDN servers.' ) + .addFromRuleset(RULES) .appendDataSource('https://github.com/felixonmars/dnsmasq-china-list') .bulkAddDomain(domains) .bulkAddDomainSuffix(domainSuffixes) diff --git a/Build/constants/microsoft-cdn.ts b/Build/constants/microsoft-cdn.ts index f6cd3aa4..bda96dc9 100644 --- a/Build/constants/microsoft-cdn.ts +++ b/Build/constants/microsoft-cdn.ts @@ -1,5 +1,11 @@ export const PROBE_DOMAINS = ['.microsoft.com', '.windows.net', '.windows.com', '.windowsupdate.com', '.windowssearch.com', '.office.net']; +export const RULES = [ + // Microsoft OCSP (HTTP Only) + String.raw`URL-REGEX,^http://www\.microsoft\.com/pki/`, + String.raw`URL-REGEX,^http://www\.microsoft\.com/pkiops/` +]; + export const DOMAINS = [ 'res.cdn.office.net', 'res-1.cdn.office.net', diff --git a/Source/domainset/cdn.conf b/Source/domainset/cdn.conf index c1267afb..d87cb3f4 100644 --- a/Source/domainset/cdn.conf +++ b/Source/domainset/cdn.conf @@ -1021,6 +1021,10 @@ cdn5.telegram.space us1-prod-images.disco-api.com .sndimg.com +# >> Neustar +ns-cdn.neustar.biz +.cdn.neustar + # >> Embed Tag / Widget .2mdn.net cdn.embedly.com diff --git a/Source/non_ip/cdn.conf b/Source/non_ip/cdn.conf index c3072638..894ca93a 100644 --- a/Source/non_ip/cdn.conf +++ b/Source/non_ip/cdn.conf @@ -14,9 +14,7 @@ DOMAIN-KEYWORD,dsn.algolia.net # Microsoft DOMAIN-WILDCARD,cdn.*.office.net DOMAIN-WILDCARD,cdn.*.microsoft.com -# Microsoft OCSP (HTTP Only) -URL-REGEX,^http://www\.microsoft\.com/pki/ -URL-REGEX,^http://www\.microsoft\.com/pkiops/ +DOMAIN-WILDCARD,cdn-*.microsoft.com # >> AppCenter Download DOMAIN-WILDCARD,appcenter-filemanagement-*.cloudapp.net # >> Daily Motion