Skip to content

fix: Prevent loading remote content via URL hash #1489

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
merged 6 commits into from
Feb 5, 2021
Merged

fix: Prevent loading remote content via URL hash #1489

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6c6abb
Prevent loading remote content via URL hash
jhildenbiddle Feb 4, 2021
0059ba2
Restore ability to execute remote content scripts
jhildenbiddle Feb 5, 2021
494704c
Merge branch 'develop' into fix-security-url-hash
jhildenbiddle Feb 5, 2021
7c0036b
Merge branch 'develop' into fix-security-url-hash
sy-records Feb 5, 2021
939c1b6
Merge branch 'develop' into fix-security-url-hash
Koooooo-7 Feb 5, 2021
561cf9d
Merge branch 'develop' into fix-security-url-hash
sy-records Feb 5, 2021
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
77 changes: 43 additions & 34 deletions src/core/fetch/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,41 +102,50 @@ export function fetchMixin(proto) {
};

proto._fetch = function(cb = noop) {
const { path, query } = this.route;
const qs = stringifyQuery(query, ['id']);
const { loadNavbar, requestHeaders, loadSidebar } = this.config;
// Abort last request

const file = this.router.getFile(path);
const req = request(file + qs, true, requestHeaders);

this.isRemoteUrl = isExternal(file);
// Current page is html
this.isHTML = /\.html$/g.test(file);

// Load main content
req.then(
(text, opt) =>
this._renderMain(
text,
opt,
this._loadSideAndNav(path, qs, loadSidebar, cb)
),
_ => {
this._fetchFallbackPage(path, qs, cb) || this._fetch404(file, qs, cb);
}
);

// Load nav
loadNavbar &&
loadNested(
path,
qs,
loadNavbar,
text => this._renderNav(text),
this,
true
const { query } = this.route;
let { path } = this.route;

// Prevent loading remote content via URL hash
// Ex: https://foo.com/#//bar.com/file.md
if (isExternal(path)) {
history.replaceState(null, '', '#');
this.router.normalize();
} else {
const qs = stringifyQuery(query, ['id']);
const { loadNavbar, requestHeaders, loadSidebar } = this.config;
// Abort last request

const file = this.router.getFile(path);
const req = request(file + qs, true, requestHeaders);

this.isRemoteUrl = isExternal(file);
// Current page is html
this.isHTML = /\.html$/g.test(file);

// Load main content
req.then(
(text, opt) =>
this._renderMain(
text,
opt,
this._loadSideAndNav(path, qs, loadSidebar, cb)
),
_ => {
this._fetchFallbackPage(path, qs, cb) || this._fetch404(file, qs, cb);
}
);

// Load nav
loadNavbar &&
loadNested(
path,
qs,
loadNavbar,
text => this._renderNav(text),
this,
true
);
}
};

proto._fetchCover = function() {
Expand Down