build: skip validation of internal calls (#122)

* build: skip validation of internal calls seia-soto/userscripts@364e979#diff-c6e4dc7a836563ce0dfea577b8fcea8f36c0d4ef78ad45bc1720d6c8e3180d9eR112 Co-authored-by: HoJeong Go <[email protected]> * chore: upddate version * build userscript --------- Co-authored-by: HoJeong Go <[email protected]>
List-KR · Apr 6, 2024 · e4abfc4 · e4abfc4
1 parent 22eaff4
commit e4abfc4
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 32 deletions.
diff --git a/microShield.user.js b/microShield.user.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "microshield",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "",
   "type": "module",
   "scripts": {

diff --git a/sources/banner.txt b/sources/banner.txt
@@ -8,7 +8,7 @@
 // @downloadURL  https://cdn.jsdelivr.net/gh/List-KR/microShield@latest/microShield.user.js
 // @license      Apache-2.0
 //
-// @version      4.0.0
+// @version      4.1.0
 // @author       PiQuark6046 and contributors
 //
 // @match        *://ygosu.com/*

diff --git a/sources/src/adshield/resources.ts b/sources/src/adshield/resources.ts
@@ -1,8 +1,7 @@
-import {UnprotectedFetch} from '../utils/secret.js'
 import {GetRandomAdShieldHost} from './validators.js'
 
 export const GetCachableHtml = async (Url: string) => {
-	const ResponseRaw = await UnprotectedFetch(Url, {
+	const ResponseRaw = await fetch(Url, {
 		cache: 'force-cache'
 	})
 	const Text = await ResponseRaw.text()
@@ -15,7 +14,7 @@ export const GetCachableHtml = async (Url: string) => {
 }
 
 export const GetResourceToken = async (ScriptUrl: string) => {
-	const ResponseRaw = await UnprotectedFetch(ScriptUrl, {
+	const ResponseRaw = await fetch(ScriptUrl, {
 		cache: 'force-cache'
 	})
 	const Text = await ResponseRaw.text()

diff --git a/sources/src/adshield/validators.ts b/sources/src/adshield/validators.ts
@@ -1,5 +1,4 @@
 import cryptoRandomString from 'crypto-random-string'
-import {JustifyCallStack} from '../utils/call-stack.js'
 import {HasSubstringSetsInString} from '../utils/string.js'
 
 export const AdshieldDomains = [
@@ -27,16 +26,12 @@ const AdshieldDomainsize = AdshieldDomains.length
 // eslint-disable-next-line no-bitwise
 export const GetRandomAdShieldHost = () => AdshieldDomains[(Number(cryptoRandomString({length: 16, type: 'numeric'})) * 0.0000000000000001 * AdshieldDomainsize) >>> 0]
 
-export const IsAdShieldCall = (Trace = JustifyCallStack()) => {
-	if (Trace.length === 0) {
-		return false
-	}
-
-	if (HasSubstringSetsInString(Trace[Trace.length - 1], AdshieldDomains)) {
+export const IsAdShieldCall = (LastLine: string) => {
+	if (HasSubstringSetsInString(LastLine, AdshieldDomains)) {
 		return true
 	}
 
-	const Url = new URL(Trace[Trace.length - 1])
+	const Url = new URL(LastLine)
 
 	if (Url.hostname !== location.hostname && Url.pathname === '/loader.min.js') {
 		return true

diff --git a/sources/src/loaders/ztinywave.ts b/sources/src/loaders/ztinywave.ts
@@ -169,6 +169,8 @@ export const Tinywave = async () => {
 		void InsertEntities(PrivateEntities)
 
 		Entities.push(...PublicEntities, ...PrivateEntities)
+
+		return Entities
 	})
 
 	Debug('sources resolves', await Promise.allSettled(SourcesResolves))

diff --git a/sources/src/utils/entities.ts b/sources/src/utils/entities.ts
@@ -62,6 +62,19 @@ export const TryCachedEntities = async () => {
 	if ((Date.now() - Data.CreatedAt) > 1000 * 60 * 60 * 24 * 30) {
 		throw new Error('The cached entities are too old!')
 	}
+
+	const TotalEntityLength = Data.Entities.reduce((State, Entity) => {
+		if (Entity.Type === EntityTypes.Head) {
+			return State + Entity.Html.length
+		}
+
+		return State
+	}, 0)
+
+	if (!TotalEntityLength) {
+		throw new Error('The cached entities has no content!')
+	}
+
 
 	Debug('restoring cached entities data=', Data)
 

diff --git a/sources/src/utils/secret.ts b/sources/src/utils/secret.ts
@@ -1,7 +1,7 @@
 import cryptoRandomString from 'crypto-random-string'
 import {AdshieldKeywords, IsAdShieldCall} from '../adshield/validators.js'
 import {Config} from '../config.js'
-import {GenerateCallStack} from './call-stack.js'
+import {GenerateCallStack, JustifyCallStack} from './call-stack.js'
 import {CreateDebug} from './logger.js'
 import {HasSubstringSetsInString} from './string.js'
 
@@ -41,7 +41,14 @@ export const ProtectFunction = <F extends Fomulate>(F: F, Options: ProtectedFunc
 			throw new Error()
 		}
 
-		if (IsAdShieldCall()) {
+		const JustifiedCallStack = JustifyCallStack()
+		const LastLine = JustifiedCallStack[JustifiedCallStack.length - 1]
+
+		if (LastLine === undefined || LastLine.startsWith('chrome') || LastLine.startsWith('webkit') || LastLine.startsWith('moz')) {
+			return false
+		}
+
+		if (IsAdShieldCall(LastLine)) {
 			E()
 		}
 
@@ -82,8 +89,6 @@ export const ProtectFunction = <F extends Fomulate>(F: F, Options: ProtectedFunc
 	}
 })
 
-export const UnprotectedFetch = fetch
-
 export const ProtectedDescriptors = new Set<unknown>()
 
 export const ProtectDescriptors = <T extends ArbitaryObject, K extends keyof T>(O: T, Key: K, NewProperty: T[K]) => {
@@ -107,24 +112,18 @@ export const ProtectDescriptors = <T extends ArbitaryObject, K extends keyof T>(
 			]
 		})
 
-		ProtectedDescriptors.add(DefineProperties)
 		ProtectedDescriptors.add(DefineProperty)
+		ProtectedDescriptors.add(DefineProperties)
 
 		Object.defineProperty(Win.Object, 'defineProperty', {
-			get() {
-				return DefineProperty
-			}
+			value: DefineProperty
 		})
 		Object.defineProperties(Win.Object, {
 			defineProperty: {
-				get() {
-					return DefineProperty
-				}
+				value: DefineProperty
 			},
 			defineProperties: {
-				get() {
-					return DefineProperties
-				}
+				value: DefineProperties
 			}
 		})
 	}