fix(interpolateName): potential issue in hash and contenthash regexp

alexander-akait · alexander-akait · commit 807fcec4e3e5 · 2018-12-27T14:44:37.000+03:00
diff --git a/lib/interpolateName.js b/lib/interpolateName.js
@@ -91,7 +91,7 @@ function interpolateName(loaderContext, name, options) {
       // `hash` and `contenthash` are same in `loader-utils` context
       // let's keep `hash` for backward compatibility
       .replace(
-        /\[(?:([^:\]]+):)?(?:hash||contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,
+        /\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,
         (all, hashType, digestType, maxLength) =>
           getHashDigest(content, hashType, digestType, parseInt(maxLength, 10))
       )

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ function interpolateName(loaderContext, name, options) {`
`91`	`91`	// `hash` and `contenthash` are same in `loader-utils` context
`92`	`92`	// let's keep `hash` for backward compatibility
`93`	`93`	`.replace(`
`94`		`- /\[(?:([^:\]]+):)?(?:hash\|\|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,`
	`94`	`+ /\[(?:([^:\]]+):)?(?:hash\|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi,`
`95`	`95`	`(all, hashType, digestType, maxLength) =>`
`96`	`96`	`getHashDigest(content, hashType, digestType, parseInt(maxLength, 10))`
`97`	`97`	`)`