Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolves an issue where the path key is set to a different path if it… #629

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Resolves an issue where the path key is set to a different path if it… #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
55eaa86
Resolves an issue where the path key is set to a different path if it…
lovelgw Jun 23, 2021
e86c3b0
Update router.spec.ts
lovelgw Jun 23, 2021
a5070e7
fix: upgrade @types/http-proxy from 1.17.5 to 1.17.6
snyk-bot Jun 24, 2021
fef7be6
Merge branch 'master' into master
lovelgw Jul 6, 2021
4934230
Merge pull request #1 from lovelgw/snyk-upgrade-a4039749a9c7d5bc02b93…
lovelgw Aug 19, 2021
b36cd95
Merge branch 'master' into master
lovelgw Aug 19, 2021
a25d411
fix: upgrade @types/http-proxy from 1.17.6 to 1.17.7
snyk-bot Aug 20, 2021
3b5d9d4
fix: upgrade is-glob from 4.0.1 to 4.0.2
snyk-bot Oct 18, 2021
e3e9ebf
fix: upgrade micromatch from 4.0.4 to 4.0.5
snyk-bot Apr 14, 2022
de4693a
Merge pull request #2 from lovelgw/snyk-upgrade-f7912bc0db1308453dcbf…
lovelgw May 15, 2023
7a4bd69
Merge pull request #3 from lovelgw/snyk-upgrade-7dec3958d6631d5c04e3d…
lovelgw May 15, 2023
2a40c76
Merge pull request #4 from lovelgw/snyk-upgrade-2563e539c26ea0648a46f…
lovelgw May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@
"ws": "^8.1.0"
},
"dependencies": {
"@types/http-proxy": "^1.17.5",
"@types/http-proxy": "^1.17.7",
"http-proxy": "^1.18.1",
"is-glob": "^4.0.1",
"is-glob": "^4.0.2",
"is-plain-obj": "^3.0.0",
"micromatch": "^4.0.2"
"micromatch": "^4.0.5"
},
"engines": {
"node": ">=12.0.0"
Expand Down
10 changes: 8 additions & 2 deletions src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,16 @@ function getTargetFromProxyTable(req, table) {

for (const [key] of Object.entries(table)) {
if (containsPath(key)) {
if (hostAndPath.indexOf(key) > -1) {
if(/^\//.test(key)) {
if(path.startsWith(key)) {
result = table[key];
logger.debug('[HPM] Router table match path only : "%s"', key);
break;
}
} else if (hostAndPath.indexOf(key) > -1) {
// match 'localhost:3000/api'
result = table[key];
logger.debug('[HPM] Router table match: "%s"', key);
logger.debug('[HPM] Router table match host and path: "%s"', key);
break;
}
} else {
Expand Down
8 changes: 8 additions & 0 deletions test/unit/router.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,5 +157,13 @@ describe('router unit test', () => {
return expect(result).resolves.toBe('http://localhost:6006');
});
});

describe('matching order of router config', () => {
it('should return another route key is use in url path configured', () => {
fakeReq.url = '/some/rest/path';
result = getTarget(fakeReq, proxyOptionWithRouter);
return expect(result).resolves.toBe('http://localhost:6007');
});
});
});
});
34 changes: 27 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@
dependencies:
"@types/express" "*"

"@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.24":
"@types/express-serve-static-core@^4.17.18":
version "4.17.24"
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==
Expand All @@ -840,10 +840,10 @@
dependencies:
"@types/node" "*"

"@types/http-proxy@^1.17.5":
version "1.17.5"
resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.5.tgz#c203c5e6e9dc6820d27a40eb1e511c70a220423d"
integrity sha512-GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q==
"@types/http-proxy@^1.17.7":
version "1.17.7"
resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f"
integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==
dependencies:
"@types/node" "*"

Expand Down Expand Up @@ -926,7 +926,7 @@
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==

"@types/serve-static@*", "@types/serve-static@^1.13.10":
"@types/serve-static@*":
version "1.13.10"
resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
Expand Down Expand Up @@ -1394,7 +1394,7 @@ brace-expansion@^1.1.7:
balanced-match "^1.0.0"
concat-map "0.0.1"

braces@^3.0.1, braces@~3.0.2:
braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
Expand Down Expand Up @@ -3102,6 +3102,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"

is-glob@^4.0.2:
version "4.0.3"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
dependencies:
is-extglob "^2.1.1"

is-number-like@^1.0.3:
version "1.0.8"
resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
Expand Down Expand Up @@ -4053,6 +4060,14 @@ micromatch@^4.0.2, micromatch@^4.0.4:
braces "^3.0.1"
picomatch "^2.2.3"

micromatch@^4.0.5:
version "4.0.5"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
dependencies:
braces "^3.0.2"
picomatch "^2.3.1"

[email protected]:
version "1.47.0"
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
Expand Down Expand Up @@ -4522,6 +4537,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==

picomatch@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==

pify@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
Expand Down