af_proxy_http: don't try to proxy back to ourselves
This commit is contained in:
parent
6ecee2abbd
commit
35b6d63289
|
@ -50,8 +50,14 @@ class Af_Proxy_Http extends Plugin {
|
||||||
public function imgproxy() {
|
public function imgproxy() {
|
||||||
$url = UrlHelper::validate(clean($_REQUEST["url"]));
|
$url = UrlHelper::validate(clean($_REQUEST["url"]));
|
||||||
|
|
||||||
// called without user context, let's just redirect to original URL
|
// immediately redirect to original URL if:
|
||||||
if (!$_SESSION["uid"] || $_REQUEST['af_proxy_http_token'] != $_SESSION['af_proxy_http_token']) {
|
// - url points back to ourselves
|
||||||
|
// - called without user context
|
||||||
|
// - session-spefific token is invalid
|
||||||
|
if (
|
||||||
|
strpos($url, get_self_url_prefix()) === 0 ||
|
||||||
|
empty($_SESSION["uid"]) ||
|
||||||
|
$_REQUEST['af_proxy_http_token'] != $_SESSION['af_proxy_http_token']) {
|
||||||
header("Location: $url");
|
header("Location: $url");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -104,6 +110,11 @@ class Af_Proxy_Http extends Plugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
private function rewrite_url_if_needed($url, $all_remote = false) {
|
private function rewrite_url_if_needed($url, $all_remote = false) {
|
||||||
|
/* don't rewrite urls pointing to ourselves */
|
||||||
|
|
||||||
|
if (strpos($url, get_self_url_prefix()) === 0)
|
||||||
|
return $url;
|
||||||
|
|
||||||
/* we don't need to handle URLs where local cache already exists, tt-rss rewrites those automatically */
|
/* we don't need to handle URLs where local cache already exists, tt-rss rewrites those automatically */
|
||||||
if (!$this->cache->exists(sha1($url))) {
|
if (!$this->cache->exists(sha1($url))) {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue