Merge pull request #15289 from webpack/disallow-digest-only-content-hash

sokra · web-flow · commit f2d99d83f0e6 · 2022-02-03T09:22:06.000+01:00
use nonNumericOnlyHash function for contentHash
diff --git a/lib/asset/AssetGenerator.js b/lib/asset/AssetGenerator.js
@@ -12,6 +12,7 @@ const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorOptions} AssetGeneratorOptions */
@@ -232,8 +233,8 @@ class AssetGenerator extends Generator {
 					const fullHash = /** @type {string} */ (
 						hash.digest(runtimeTemplate.outputOptions.hashDigest)
 					);
-					const contentHash = fullHash.slice(
-						0,
+					const contentHash = nonNumericOnlyHash(
+						fullHash,
 						runtimeTemplate.outputOptions.hashDigestLength
 					);
 					module.buildInfo.fullContentHash = fullHash;
diff --git a/lib/css/CssModulesPlugin.js b/lib/css/CssModulesPlugin.js
@@ -19,6 +19,7 @@ const { compareModulesByIdentifier } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const createHash = require("../util/createHash");
 const memoize = require("../util/memoize");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const CssExportsGenerator = require("./CssExportsGenerator");
 const CssGenerator = require("./CssGenerator");
 const CssParser = require("./CssParser");
@@ -201,7 +202,7 @@ class CssModulesPlugin {
 						hash.update(chunkGraph.getModuleHash(module, chunk.runtime));
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.css = digest.substr(0, hashDigestLength);
+					chunk.contentHash.css = nonNumericOnlyHash(digest, hashDigestLength);
 				});
 				compilation.hooks.renderManifest.tap(plugin, (result, options) => {
 					const { chunkGraph } = compilation;
diff --git a/lib/javascript/JavascriptModulesPlugin.js b/lib/javascript/JavascriptModulesPlugin.js
@@ -24,6 +24,7 @@ const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const createHash = require("../util/createHash");
+const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { intersectRuntime } = require("../util/runtime");
 const JavascriptGenerator = require("./JavascriptGenerator");
 const JavascriptParser = require("./JavascriptParser");
@@ -398,7 +399,10 @@ class JavascriptModulesPlugin {
 						xor.updateHash(hash);
 					}
 					const digest = /** @type {string} */ (hash.digest(hashDigest));
-					chunk.contentHash.javascript = digest.substr(0, hashDigestLength);
+					chunk.contentHash.javascript = nonNumericOnlyHash(
+						digest,
+						hashDigestLength
+					);
 				});
 				compilation.hooks.additionalTreeRuntimeRequirements.tap(
 					"JavascriptModulesPlugin",
diff --git a/lib/util/nonNumericOnlyHash.js b/lib/util/nonNumericOnlyHash.js
@@ -0,0 +1,22 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+const A_CODE = "a".charCodeAt(0);
+
+/**
+ * @param {string} hash hash
+ * @param {number} hashLength hash length
+ * @returns {string} returns hash that has at least one non numeric char
+ */
+module.exports = (hash, hashLength) => {
+	if (hashLength < 1) return "";
+	const slice = hash.slice(0, hashLength);
+	if (slice.match(/[^\d]/)) return slice;
+	return `${String.fromCharCode(
+		A_CODE + (parseInt(hash[0], 10) % 6)
+	)}${slice.slice(1)}`;
+};
diff --git a/test/nonNumericOnlyHash.unittest.js b/test/nonNumericOnlyHash.unittest.js
@@ -0,0 +1,31 @@
+"use strict";
+
+const nonNumericOnlyHash = require("../lib/util/nonNumericOnlyHash");
+
+it("hashLength=0", () => {
+	expect(nonNumericOnlyHash("111", 0)).toBe("");
+});
+
+it("abc", () => {
+	expect(nonNumericOnlyHash("abc", 10)).toBe("abc");
+});
+
+it("abc1", () => {
+	expect(nonNumericOnlyHash("abc1", 3)).toBe("abc");
+});
+
+it("ab11", () => {
+	expect(nonNumericOnlyHash("ab11", 3)).toBe("ab1");
+});
+
+it("0111", () => {
+	expect(nonNumericOnlyHash("0111", 3)).toBe("a11");
+});
+
+it("911a", () => {
+	expect(nonNumericOnlyHash("911a", 3)).toBe("d11");
+});
+
+it("511a", () => {
+	expect(nonNumericOnlyHash("511a", 3)).toBe("f11");
+});
