fix: cannot resolve module if location headers is relative or absolut…

…e path. close #97
axetroy · Mar 16, 2020 · 75d6027 · 75d6027
1 parent 42e9fb5
commit 75d6027
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 4 deletions.
diff --git a/...t/deps/https/example.com/2fd053a88435858a2f3f08c14ac445b0e2f9fd6b74bc40762658c68a42108670 b/...t/deps/https/example.com/2fd053a88435858a2f3f08c14ac445b0e2f9fd6b74bc40762658c68a42108670
diff --git a/...xample.com/2fd053a88435858a2f3f08c14ac445b0e2f9fd6b74bc40762658c68a42108670.metadata.json b/...xample.com/2fd053a88435858a2f3f08c14ac445b0e2f9fd6b74bc40762658c68a42108670.metadata.json
@@ -0,0 +1,6 @@
+{
+ "headers": {
+ "location": "go_to_invalid"
+ },
+ "url": "https://example.com/redirect_to_invalid"
+}
diff --git a/...t/deps/https/example.com/510a38a33ab16b39d957c066a56c4b04a38c866e84b10c55d0f7ad9f4b368201 b/...t/deps/https/example.com/510a38a33ab16b39d957c066a56c4b04a38c866e84b10c55d0f7ad9f4b368201
diff --git a/...xample.com/510a38a33ab16b39d957c066a56c4b04a38c866e84b10c55d0f7ad9f4b368201.metadata.json b/...xample.com/510a38a33ab16b39d957c066a56c4b04a38c866e84b10c55d0f7ad9f4b368201.metadata.json
@@ -0,0 +1,6 @@
+{
+ "headers": {
+ "location": "/esm/mod.ts"
+ },
+ "url": "https://example.com/redirect_to_absolute"
+}
diff --git a/...t/deps/https/example.com/d2c891d1a65880123bd43fc2fba9a6d094b8de88a9efc3023acd53c961c9f4b5 b/...t/deps/https/example.com/d2c891d1a65880123bd43fc2fba9a6d094b8de88a9efc3023acd53c961c9f4b5
diff --git a/...xample.com/d2c891d1a65880123bd43fc2fba9a6d094b8de88a9efc3023acd53c961c9f4b5.metadata.json b/...xample.com/d2c891d1a65880123bd43fc2fba9a6d094b8de88a9efc3023acd53c961c9f4b5.metadata.json
@@ -0,0 +1,6 @@
+{
+ "headers": {
+ "location": "https://example.com/redirect_to_loop"
+ },
+ "url": "https://example.com/redirect_to_loop"
+}
diff --git a/core/module_resolver.test.ts b/core/module_resolver.test.ts
@@ -163,7 +163,14 @@ test("core / module_resolver: resolve module if redirect", () => {
 
  const resolver = ModuleResolver.create(__filename, importMapFile);
 
- expect(resolver.resolveModules(["https://example.com/redirect"])).toEqual([
+ expect(
+ resolver.resolveModules([
+ "https://example.com/redirect",
+ "https://example.com/redirect_to_absolute",
+ "https://example.com/redirect_to_invalid",
+ "https://example.com/redirect_to_loop"
+ ])
+ ).toEqual([
  {
  origin: "https://another.example.com/path/mod.ts",
  filepath: path.join(
@@ -180,6 +187,25 @@ test("core / module_resolver: resolve module if redirect", () => {
  "another.example.com",
  "32cd9336a09393d88fc22cf6f95ae006e3f2742a6c461967b2ba7954c5283fbf"
  )
- }
+ },
+ {
+ origin: "https://example.com/esm/mod.ts",
+ filepath: path.join(
+ denoDir,
+ "deps",
+ "https",
+ "example.com",
+ "8afd52da760dab7f2deda4b7453197f50421f310372c5da3f3847ffd062fa1cf"
+ ),
+ module: path.join(
+ denoDir,
+ "deps",
+ "https",
+ "example.com",
+ "8afd52da760dab7f2deda4b7453197f50421f310372c5da3f3847ffd062fa1cf"
+ )
+ },
+ undefined,
+ undefined
  ] as ResolvedModule[]);
 });
diff --git a/core/module_resolver.ts b/core/module_resolver.ts
@@ -80,9 +80,23 @@ export class ModuleResolver implements ModuleResolverInterface {
  return;
  }
 
- const redirect = meta.headers["location"];
+ let redirect = meta.headers["location"];
+
+ if (redirect) {
+ redirect = isHttpURL(redirect) // eg: https://redirect.com/path/to/redirect
+ ? redirect
+ : path.posix.isAbsolute(redirect) // eg: /path/to/redirect
+ ? `${url.protocol}//${url.host}${redirect}`
+ : // eg: ./path/to/redirect
+ `${url.protocol}//${url.host}${path.posix.resolve(
+ url.pathname,
+ redirect
+ )}`;
+
+ if (!isHttpURL(redirect) || redirect === httpModuleURL) {
+ return;
+ }
 
- if (redirect && redirect !== httpModuleURL) {
  return this.resolveFromRemote(redirect);
  }