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

Merge pull request #3944 from shtrom/always-hash-exists-url

Browse source 
Always hash exists url
This commit is contained in:
Jérémy Benoist 2019-05-28 14:18:33 +02:00 • committed by GitHub
commit 2cbee36a01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 84 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

88
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -14,6 +14,7 @@ use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Event\EntryDeletedEvent;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\UrlHasher;
class EntryRestController extends WallabagRestController
{
@ -43,50 +44,45 @@ class EntryRestController extends WallabagRestController
$returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id');
$urls = $request->query->get('urls', []);
$hashedUrls = $request->query->get('hashed_urls', []);
// handle multiple urls first
if (!empty($hashedUrls)) {
$results = [];
foreach ($hashedUrls as $hashedUrl) {
$res = $repo->findByHashedUrlAndUserId($hashedUrl, $this->getUser()->getId());
$results[$hashedUrl] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
}
// @deprecated, to be remove in 3.0
if (!empty($urls)) {
$results = [];
foreach ($urls as $url) {
$res = $repo->findByUrlAndUserId($url, $this->getUser()->getId());
$results[$url] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
}
// let's see if it is a simple url?
$url = $request->query->get('url', '');
$hashedUrl = $request->query->get('hashed_url', '');
if (!empty($hashedUrl)) {
$hashedUrls[] = $hashedUrl;
}
if (empty($url) && empty($hashedUrl)) {
$urls = $request->query->get('urls', []);
$url = $request->query->get('url', '');
if (!empty($url)) {
$urls[] = $url;
}
$urlHashMap = [];
foreach ($urls as $urlToHash) {
$urlHash = UrlHasher::hashUrl($urlToHash);
$hashedUrls[] = $urlHash;
$urlHashMap[$urlHash] = $urlToHash;
}
if (empty($hashedUrls)) {
throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
}
$method = 'findByUrlAndUserId';
if (!empty($hashedUrl)) {
$method = 'findByHashedUrlAndUserId';
$url = $hashedUrl;
$results = [];
foreach ($hashedUrls as $hashedUrlToSearch) {
$res = $repo->findByHashedUrlAndUserId($hashedUrlToSearch, $this->getUser()->getId());
$results[$hashedUrlToSearch] = $this->returnExistInformation($res, $returnId);
}
$res = $repo->$method($url, $this->getUser()->getId());
$results = $this->replaceUrlHashes($results, $urlHashMap);
return $this->sendResponse(['exists' => $this->returnExistInformation($res, $returnId)]);
if (!empty($url) || !empty($hashedUrl)) {
$hu = array_keys($results)[0];
return $this->sendResponse(['exists' => $results[$hu]]);
}
return $this->sendResponse($results);
}
/**
@ -804,6 +800,24 @@ class EntryRestController extends WallabagRestController
return $this->sendResponse($results);
}
/**
* Replace the hashedUrl keys in $results with the unhashed URL from the
* request, as recorded in $urlHashMap.
*/
private function replaceUrlHashes(array $results, array $urlHashMap)
{
$newResults = [];
foreach ($results as $hash => $res) {
if (isset($urlHashMap[$hash])) {
$newResults[$urlHashMap[$hash]] = $res;
} else {
$newResults[$hash] = $res;
}
}
return $newResults;
}
/**
* Retrieve value from the request.
* Used for POST & PATCH on a an entry.
@ -832,8 +846,8 @@ class EntryRestController extends WallabagRestController
/**
* Return information about the entry if it exist and depending on the id or not.
*
* @param Entry|null $entry
* @param bool $returnId
* @param Entry|bool|null $entry
* @param bool $returnId
*
* @return bool|int
*/