Sanity check content mimes

shockpkg · May 2, 2024 · 8cf2cb4 · 8cf2cb4
1 parent bf91123
commit 8cf2cb4
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 11 deletions.
diff --git a/bin/download-flash-cn.mjs b/bin/download-flash-cn.mjs
@@ -36,7 +36,7 @@ async function main() {
 	}));
 
 	const each = async resource => {
-		const {name, source, referer, file} = resource.info;
+		const {name, source, referer, file, mimetype} = resource.info;
 		const filedir = pathJoin(outdir, name);
 		const filepath = pathJoin(filedir, file);
 
@@ -52,6 +52,14 @@ async function main() {
 					'User-Agent': userAgent,
 					Referer: referer
 				},
+				response(response) {
+					const ct = response.headers.get('content-type');
+					if (ct !== mimetype) {
+						throw new Error(
+							`Mimetype: ${ct} != ${mimetype}: ${source}`
+						);
+					}
+				},
 				progress({size, total}) {
 					resource.download = size / total;
 				}

diff --git a/bin/download-harman-air-runtime.mjs b/bin/download-harman-air-runtime.mjs
@@ -29,7 +29,7 @@ async function main() {
 	}));
 
 	const each = async resource => {
-		const {name, source, file} = resource.info;
+		const {name, source, file, mimetype} = resource.info;
 		const filedir = pathJoin(outdir, name);
 		const filepath = pathJoin(filedir, file);
 
@@ -44,6 +44,14 @@ async function main() {
 				headers: {
 					'User-Agent': userAgent
 				},
+				response(response) {
+					const ct = response.headers.get('content-type');
+					if (ct !== mimetype) {
+						throw new Error(
+							`Mimetype: ${ct} != ${mimetype}: ${source}`
+						);
+					}
+				},
 				progress({size, total}) {
 					resource.download = size / total;
 				}

diff --git a/bin/download-harman-air-sdk.mjs b/bin/download-harman-air-sdk.mjs
@@ -32,7 +32,7 @@ async function main() {
 	}));
 
 	const each = async resource => {
-		const {name, source, file} = resource.info;
+		const {name, source, file, mimetype} = resource.info;
 		const filedir = pathJoin(outdir, name);
 		const filepath = pathJoin(filedir, file);
 
@@ -48,6 +48,14 @@ async function main() {
 					'User-Agent': userAgent,
 					Cookie: cookieHeader
 				},
+				response(response) {
+					const ct = response.headers.get('content-type');
+					if (ct !== mimetype) {
+						throw new Error(
+							`Mimetype: ${ct} != ${mimetype}: ${source}`
+						);
+					}
+				},
 				progress({size, total}) {
 					resource.download = size / total;
 				}

diff --git a/util/download.mjs b/util/download.mjs
@@ -11,6 +11,9 @@ export async function download(output, url, opts = {}) {
 	const response = await retry(() =>
 		fetch(url, {headers: opts.headers || {}})
 	);
+	if (opts.response) {
+		opts.response(response);
+	}
 	if (response.status !== 200) {
 		throw new Error(`Status code: ${response.status}: ${url}`);
 	}

diff --git a/util/flashcn.mjs b/util/flashcn.mjs
@@ -100,6 +100,25 @@ function dateNorm(date) {
 	return date;
 }
 
+function mimetype(file) {
+	if (/\.exe/i.test(file)) {
+		return 'application/x-msdownload';
+	}
+	if (/\.dmg/i.test(file)) {
+		return 'application/x-apple-diskimage';
+	}
+	if (/\.rpm/i.test(file)) {
+		return 'application/octet-stream';
+	}
+	if (/\.tar\.gz/i.test(file)) {
+		return 'application/octet-stream';
+	}
+	if (/\.swc/i.test(file)) {
+		return 'application/octet-stream';
+	}
+	return null;
+}
+
 async function listRelease() {
 	const htmlUrl = 'https://www.flash.cn/download';
 	const fverUrl = 'https://api.flash.cn/config/flashVersion';
@@ -132,21 +151,23 @@ async function listRelease() {
 		// }
 
 		const source = getSource(info.downloadURL, info.version);
+		const file = urlFile(source);
 		const type = idRelease.get(id);
 		if (!type) {
 			throw new Error(`Unknown id: ${id}`);
 		}
 
 		r.push({
 			name: `flash-player-${info.version}-${type}-cn`,
-			file: urlFile(source),
+			file,
 			source,
 			referer: htmlUrl,
 			list: 'release',
 			id,
 			date: dateNorm(info.date),
 			version: info.version,
-			size: info.size
+			size: info.size,
+			mimetype: mimetype(file)
 		});
 		ids.add(id);
 	}
@@ -229,7 +250,8 @@ async function listDebug() {
 			id,
 			date: dated,
 			version,
-			size: null
+			size: null,
+			mimetype: mimetype(file)
 		});
 		ids.add(id);
 	}

diff --git a/util/harman.mjs b/util/harman.mjs
@@ -12,8 +12,8 @@ export const userAgent =
 	'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0';
 
 const runtimeFiles = [
-	['AdobeAIR.exe', 'windows'],
-	['AdobeAIR.dmg', 'mac']
+	['AdobeAIR.exe', 'windows', 'application/x-msdownload'],
+	['AdobeAIR.dmg', 'mac', 'application/x-apple-diskimage']
 ];
 
 const legacy = new Set([
@@ -101,7 +101,8 @@ export async function sdks() {
 			name,
 			version,
 			file,
-			source
+			source,
+			mimetype: 'application/octet-stream'
 		});
 	}
 
@@ -188,7 +189,7 @@ export async function runtimes() {
 	}
 
 	const downloads = [];
-	for (const [file, os] of runtimeFiles) {
+	for (const [file, os, mimetype] of runtimeFiles) {
 		const sha256 = sha256s.get(file);
 		if (!sha256) {
 			throw new Error(`No sha256 for: ${file}`);
@@ -199,7 +200,8 @@ export async function runtimes() {
 			version,
 			file,
 			sha256,
-			source: `${runtimeFileBase}${file}`
+			source: `${runtimeFileBase}${file}`,
+			mimetype
 		});
 	}
 	return downloads;