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.

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

fix(http_requests): allow blob: to prepend URL string #637

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
57 changes: 57 additions & 0 deletions src/util/http_request.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/**
* @license
* Copyright 2016 Google Inc.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { describe, it, expect } from "vitest";

import { parseUrl } from "#src/util/http_request.ts";

describe("parseUrl", () => {
it("parses http correctly", () => {
expect(parseUrl("http://example.foo/bar")).toEqual({
protcol: "http",
host: "example.foo",
path: "/bar",
});
});
it("parses http with port correctly", () => {
expect(parseUrl("http://example.foo:8080/bar")).toEqual({
protcol: "http",
host: "example.foo:8080",
path: "/bar",
});
});
it("parses https correctly", () => {
expect(parseUrl("https://example.foo/bar")).toEqual({
protcol: "https",
host: "example.foo",
path: "/bar",
});
});
it("parses blob correctly", () => {
expect(parseUrl("blob:http://example.foo/bar")).toEqual({
protcol: "http",
host: "example.foo",
path: "/bar",
});
});
it("parses blob with port correctly", () => {
expect(parseUrl("blob:http://example.foo:8080/bar")).toEqual({
protcol: "http",
host: "example.foo:8080",
path: "/bar",
});
});
});
4 changes: 2 additions & 2 deletions src/util/http_request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,12 @@ export function parseUrl(url: string): {
host: string;
path: string;
} {
const urlProtocolPattern = /^([^:/]+):\/\/([^/]+)((?:\/.*)?)$/;
const urlProtocolPattern = /^(blob:)?([^:/]+):\/\/([^/]+)((?:\/.*)?)$/;
const match = url.match(urlProtocolPattern);
if (match === null) {
throw new Error(`Invalid URL: ${JSON.stringify(url)}`);
}
return { protocol: match[1], host: match[2], path: match[3] };
return { protocol: match[2], host: match[3], path: match[4] };
}

export function isNotFoundError(e: any) {
Expand Down