oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Protect share with a CSRF token

Browse source
This commit is contained in:
Yassine Guedidi 2025-03-23 12:52:16 +01:00
parent eb8408b22f
commit 0d8429dfc7
4 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/Resources/static/themes/material/css/dark_theme.scss
View file

@ -89,6 +89,7 @@
.mass-action-tags .mass-action-tags-input.mass-action-tags-input, .mass-action-tags .mass-action-tags-input.mass-action-tags-input,
.side-nav li:not(.logo) > a:hover, .side-nav li:not(.logo) > a:hover,
.side-nav li:not(.logo) button:hover,
.side-nav .collapsible-header:hover, .side-nav .collapsible-header:hover,
.side-nav.fixed .collapsible-header:hover { .side-nav.fixed .collapsible-header:hover {
background-color: #1d1d1d; background-color: #1d1d1d;

10
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -543,12 +543,16 @@ class EntryController extends AbstractController
/** /**
* Get public URL for entry (and generate it if necessary). * Get public URL for entry (and generate it if necessary).
* *
* @Route("/share/{id}", requirements={"id" = "\d+"}, name="share") * @Route("/share/{id}", name="share", methods={"POST"}, requirements={"id" = "\d+"})
* *
* @return Response * @return Response
*/ */
public function shareAction(Entry $entry) public function shareAction(Request $request, Entry $entry)
{ {
if (!$this->isCsrfTokenValid('share-entry', $request->request->get('token'))) {
throw new BadRequestHttpException('Bad CSRF token.');
}
$this->checkUserAction($entry); $this->checkUserAction($entry);
if (null === $entry->getUid()) { if (null === $entry->getUid()) {
@ -587,7 +591,7 @@ class EntryController extends AbstractController
/** /**
* Ability to view a content publicly. * Ability to view a content publicly.
* *
* @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry") * @Route("/share/{uid}", name="share_entry", methods={"GET"}, requirements={"uid" = ".+"})
* @Cache(maxage="25200", smaxage="25200", public=true) * @Cache(maxage="25200", smaxage="25200", public=true)
* *
* @return Response * @return Response

10
src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
View file

@ -159,9 +159,13 @@
<ul> <ul>
{% if craue_setting('share_public') %} {% if craue_setting('share_public') %}
<li> <li>
<a href="{{ path('share', {'id': entry.id}) }}" target="_blank" title="{{ 'entry.view.left_menu.public_link'|trans }}" class="tool icon-eye"> <form action="{{ path('share', {'id': entry.id}) }}" method="post">
<span>{{ 'entry.view.left_menu.public_link'|trans }}</span> <input type="hidden" name="token" value="{{ csrf_token('share-entry') }}"/>
</a>
<button type="submit" formtarget="_blank" class="btn-link tool icon-eye" title="{{ 'entry.view.left_menu.public_link'|trans }}">
<span>{{ 'entry.view.left_menu.public_link'|trans }}</span>
</button>
</form>
</li> </li>
<li> <li>
<a href="{{ path('delete_share', {'id': entry.id}) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon-no-eye"> <a href="{{ path('delete_share', {'id': entry.id}) }}" title="{{ 'entry.view.left_menu.delete_public_link'|trans }}" class="tool icon-no-eye">

5
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -1155,7 +1155,10 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertSame(404, $client->getResponse()->getStatusCode()); $this->assertSame(404, $client->getResponse()->getStatusCode());
// generating the uid // generating the uid
$client->request('GET', '/share/' . $content->getId()); $crawler = $client->request('GET', '/view/' . $content->getId());
$client->submit($crawler->filter('.left-bar')->selectButton('entry.view.left_menu.public_link')->form());
$this->assertSame(302, $client->getResponse()->getStatusCode()); $this->assertSame(302, $client->getResponse()->getStatusCode());
$shareUrl = $client->getResponse()->getTargetUrl(); $shareUrl = $client->getResponse()->getTargetUrl();