fix(builtinoperators): fix function keyMatch3

abichinger · abichinger · commit 1245aa072b47 · 2020-11-26T22:40:09.000+01:00
fix #214 Signed-off-by: Andreas Bichinger <andreas.bichinger@gmail.com>
diff --git a/src/util/builtinOperators.ts b/src/util/builtinOperators.ts
@@ -88,7 +88,7 @@ function keyMatch3(key1: string, key2: string): boolean {
     key2 = key2.replace(regexp, '$1[^/]+$2');
   }
 
-  return regexMatch(key1, key2);
+  return regexMatch(key1, '^' + key2 + '$');
 }
 
 // keyMatch3Func is the wrapper for keyMatch3.
diff --git a/test/util.test.ts b/test/util.test.ts
@@ -54,13 +54,15 @@ test('test keyMatch2Func', () => {
   expect(util.keyMatch2Func('/foo/baz', '/foo/:bar')).toEqual(true);
   expect(util.keyMatch2Func('/foo/baz/foo', '/foo/:bar/foo')).toEqual(true);
   expect(util.keyMatch2Func('/baz', '/foo')).toEqual(false);
+  expect(util.keyMatch2Func('/foo/baz', '/foo')).toEqual(false);
 });
 
 test('test keyMatch3Func', () => {
   expect(util.keyMatch3Func('/foo/bar', '/foo/*')).toEqual(true);
   expect(util.keyMatch3Func('/foo/baz', '/foo/{bar}')).toEqual(true);
   expect(util.keyMatch3Func('/foo/baz/foo', '/foo/{bar}/foo')).toEqual(true);
   expect(util.keyMatch3Func('/baz', '/foo')).toEqual(false);
+  expect(util.keyMatch3Func('/foo/baz', '/foo')).toEqual(false);
 });
 
 test('test keyMatch4Func', () => {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ function keyMatch3(key1: string, key2: string): boolean {`
`88`	`88`	`key2 = key2.replace(regexp, '$1[^/]+$2');`
`89`	`89`	`}`
`90`	`90`
`91`		`- return regexMatch(key1, key2);`
	`91`	`+ return regexMatch(key1, '^' + key2 + '$');`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// keyMatch3Func is the wrapper for keyMatch3.`