Commitb30dfdb

committed

fix: backport regex change from 8.0.1

PR-URL:#19Credit:@nlfClose:#19Reviewed-by:@wraithgar

1 parenta4337cd commitb30dfdbCopy full SHA for b30dfdb

File tree

+29

-1

lines changed

+29

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']`
`8`	`8`
`9`	`9`	`constBASE64_REGEX=/^[a-z0-9+/]+(?:=?=?)$/i`
`10`	`10`	`constSRI_REGEX=/^([^-]+)-([^?]+)([?\S])$/`
`11`		`-constSTRICT_SRI_REGEX=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E])$/`
	`11`	`+constSTRICT_SRI_REGEX=/^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)?$/`
`12`	`12`	`constVCHAR_REGEX=/^[\x21-\x7E]+$/`
`13`	`13`
`14`	`14`	`constSsriOpts=figgyPudding({`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,34 @@ test('parses single-entry integrity string', t => {`
`26`	`26`	`t.done()`
`27`	`27`	`})`
`28`	`28`
	`29`	`+test('parses options from integrity string',t=>{`
	`30`	`+constsha=hash(TEST_DATA,'sha512')`
	`31`	+constintegrity=`sha512-${sha}?one?two?three`
	`32`	`+t.deepEqual(ssri.parse(integrity),{`
	`33`	`+sha512:[{`
	`34`	`+source:integrity,`
	`35`	`+digest:sha,`
	`36`	`+algorithm:'sha512',`
	`37`	`+options:['one','two','three']`
	`38`	`+}]`
	`39`	`+},'single entry parsed into full Integrity instance')`
	`40`	`+t.done()`
	`41`	`+})`
	`42`	`+`
	`43`	`+test('parses options from integrity string in strict mode',t=>{`
	`44`	`+constsha=hash(TEST_DATA,'sha512')`
	`45`	+constintegrity=`sha512-${sha}?one?two?three`
	`46`	`+t.deepEqual(ssri.parse(integrity,{strict:true}),{`
	`47`	`+sha512:[{`
	`48`	`+source:integrity,`
	`49`	`+digest:sha,`
	`50`	`+algorithm:'sha512',`
	`51`	`+options:['one','two','three']`
	`52`	`+}]`
	`53`	`+},'single entry parsed into full Integrity instance')`
	`54`	`+t.done()`
	`55`	`+})`
	`56`	`+`
`29`	`57`	`test('can parse single-entry string directly into Hash',t=>{`
`30`	`58`	`constsha=hash(TEST_DATA,'sha512')`
`31`	`59`	constintegrity=`sha512-${sha}`

Comments

(0)