Skip to content

Fix: wrong load external resources when the local protocol is file:// #309

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

Merged
frank-weindel merged 4 commits into from
Jun 26, 2024
Merged

Fix: wrong load external resources when the local protocol is file:// #309

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c54001
chore: add REGEX_URL and check if a network resource inside convertUr…
albdima83 Jun 25, 2024
3e73f39
chore: rename regex_url to external_regex_url
albdima83 Jun 25, 2024
51ab16c
chore: add check blob data inside convertUrlToAbsolute
albdima83 Jun 25, 2024
eba04ee
fix: improved regex for protocol matching
albdima83 Jun 25, 2024
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: 4 additions & 2 deletions src/core/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
* limitations under the License.
*/

export const PROTOCOL_REGEX = /^(data|ftps?|https?):/;

export type RGBA = [r: number, g: number, b: number, a: number];
export const getNormalizedRgbaComponents = (rgba: number): RGBA => {
const r = rgba >>> 24;
Expand Down Expand Up @@ -250,8 +252,8 @@ export function isRectPositive(rect: Rect): boolean {
}

export function convertUrlToAbsolute(url: string): string {
// handle local file imports
if (self.location.protocol === 'file:') {
// handle local file imports if the url isn't remote resource or data blob
if (self.location.protocol === 'file:' && !PROTOCOL_REGEX.test(url)) {
const path = self.location.pathname.split('/');
path.pop();
const basePath = path.join('/');
Expand Down