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: use noreferer to prevent exposing shiori instance url to archived websites #802

Merged
merged 2 commits into from Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/view/assets/js/component/bookmark.js
Expand Up @@ -4,7 +4,7 @@ var template = `
v-if="editMode"
@click="selectBookmark">
</a>
<a class="bookmark-link" :href="mainURL" target="_blank" rel="noopener">
<a class="bookmark-link" :href="mainURL" target="_blank" rel="noopener noreferrer">
<span class="thumbnail" v-if="thumbnailVisible" :style="thumbnailStyleURL"></span>
<p class="title" dir="auto">{{title}}
<i v-if="hasContent" class="fas fa-file-alt"></i>
Expand All @@ -19,7 +19,7 @@ var template = `
</div>
<div class="spacer"></div>
<div class="bookmark-menu">
<a class="url" :href="url" target="_blank" rel="noopener">
<a class="url" :href="url" target="_blank" rel="noopener noreferrer">
{{hostnameURL}}
</a>
<template v-if="!editMode && menuVisible">
Expand Down
4 changes: 2 additions & 2 deletions internal/view/content.html
Expand Up @@ -26,7 +26,7 @@
<p id="metadata" v-cloak>Added {{localtime()}}</p>
<p id="title" dir="auto">$$.Book.Title$$</p>
<div id="links">
<a href="$$.Book.URL$$" target="_blank" rel="noopener">View Original</a>
<a href="$$.Book.URL$$" target="_blank" rel="noopener noreferrer">View Original</a>
$$if .Book.HasArchive$$
<a href="bookmark/$$.Book.ID$$/archive">View Archive</a>
$$end$$
Expand Down Expand Up @@ -82,7 +82,7 @@

document.querySelectorAll("#content a").forEach(elem => {
elem.setAttribute("target", "_blank");
elem.setAttribute("rel", "noopener");
elem.setAttribute("rel", "noopener noreferrer");
});
}
});
Expand Down
2 changes: 1 addition & 1 deletion internal/webserver/handler.go
Expand Up @@ -75,7 +75,7 @@
`<div id="shiori-archive-header">
<p id="shiori-logo"><span>栞</span>shiori</p>
<div class="spacer"></div>
<a href="$$.URL$$" target="_blank">View Original</a>
<a href="$$.URL$$" target="_blank" rel="noopener noreferrer">View Original</a>

Check warning on line 78 in internal/webserver/handler.go

View check run for this annotation

Codecov / codecov/patch

internal/webserver/handler.go#L78

Added line #L78 was not covered by tests
$$if .HasContent$$
<a href="/bookmark/$$.ID$$/content">View Readable</a>
$$end$$
Expand Down