"fox");
}
+ private $ssl_known_whitelist = "imgur.com gfycat.com i.reddituploads.com pbs.twimg.com i.redd.it i.sli.mg media.tumblr.com";
+
function is_public_method($method) {
return $method === "imgproxy";
}
$host->add_hook($host::HOOK_RENDER_ARTICLE, $this);
$host->add_hook($host::HOOK_RENDER_ARTICLE_CDM, $this);
- $host->add_hook($host::HOOK_RENDER_ARTICLE_API, $this);
$host->add_hook($host::HOOK_ENCLOSURE_ENTRY, $this);
$host->add_hook($host::HOOK_PREFS_TAB, $this);
}
function hook_enclosure_entry($enc) {
- if (preg_match("/image/", $enc["content_type"]) || preg_match("/\.(jpe?g|png|gif|bmp)$/i", $enc["filename"])) {
+ if (preg_match("/image/", $enc["content_type"])) {
$proxy_all = $this->host->get($this, "proxy_all");
$enc["content_url"] = $this->rewrite_url_if_needed($enc["content_url"], $proxy_all);
return $this->hook_render_article_cdm($article);
}
- function hook_render_article_api($headline) {
- return $this->hook_render_article_cdm($headline["headline"], true);
- }
-
public function imgproxy() {
$url = rewrite_relative_url(SELF_URL_PATH, $_REQUEST["url"]);
- $kind = (int) $_REQUEST["kind"]; // 1 = video
// called without user context, let's just redirect to original URL
if (!$_SESSION["uid"]) {
return;
}
- $extension = $kind == 1 ? '.mp4' : '.png';
- $local_filename = CACHE_DIR . "/images/" . sha1($url) . $extension;
+ $local_filename = CACHE_DIR . "/images/" . sha1($url);
if ($_REQUEST["debug"] == "1") { print $url . "\n" . $local_filename; die; }
$data = fetch_file_contents(array("url" => $url));
if ($data) {
- if (file_put_contents($local_filename, $data)) {
- $mimetype = mime_content_type($local_filename);
- header("Content-type: $mimetype");
+
+ $disable_cache = $this->host->get($this, "disable_cache");
+
+ if (!$disable_cache && strlen($data) > MIN_CACHE_FILE_SIZE) {
+ if (file_put_contents($local_filename, $data)) {
+ $mimetype = mime_content_type($local_filename);
+ header("Content-type: $mimetype");
+ }
}
print $data;
+ } else {
+ global $fetch_last_error;
+ global $fetch_last_error_code;
+ global $fetch_last_error_content;
+
+ if (function_exists("imagecreate") && !isset($_REQUEST["text"])) {
+ $img = imagecreate(450, 75);
+
+ /*$bg =*/ imagecolorallocate($img, 255, 255, 255);
+ $textcolor = imagecolorallocate($img, 255, 0, 0);
+
+ imagerectangle($img, 0, 0, 450-1, 75-1, $textcolor);
+
+ imagestring($img, 5, 5, 5, "Proxy request failed", $textcolor);
+ imagestring($img, 5, 5, 30, truncate_middle($url, 46, "..."), $textcolor);
+ imagestring($img, 5, 5, 55, "HTTP Code: $fetch_last_error_code", $textcolor);
+
+ header("Content-type: image/png");
+ print imagepng($img);
+ imagedestroy($img);
+
+ } else {
+ header("Content-type: text/html");
+
+ http_response_code(400);
+
+ print "<h1>Proxy request failed.</h1>";
+ print "<p>Fetch error $fetch_last_error ($fetch_last_error_code)</p>";
+ print "<p>URL: $url</p>";
+ print "<textarea cols='80' rows='25'>" . htmlspecialchars($fetch_last_error_content) . "</textarea>";
+ }
}
}
}
- function rewrite_url_if_needed($url, $kind, $all_remote = false) {
+ function rewrite_url_if_needed($url, $all_remote = false) {
$scheme = parse_url($url, PHP_URL_SCHEME);
if ($all_remote) {
if (($scheme != 'https' && $scheme != "") || $is_remote) {
if (strpos($url, "data:") !== 0) {
- $url = "public.php?op=pluginhandler&plugin=af_zz_imgproxy&pmethod=imgproxy&kind=$kind&url=" .
+ $parts = parse_url($url);
+
+ foreach (explode(" " , $this->ssl_known_whitelist) as $host) {
+ if (substr(strtolower($parts['host']), -strlen($host)) === strtolower($host)) {
+ $parts['scheme'] = 'https';
+ $url = build_url($parts);
+ if ($all_remote && $is_remote) {
+ break;
+ } else {
+ return $url;
+ }
+ }
+ }
+
+ return get_self_url_prefix() . "/public.php?op=pluginhandler&plugin=af_zz_imgproxy&pmethod=imgproxy&url=" .
urlencode($url);
}
}
return $url;
}
+ /**
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
function hook_render_article_cdm($article, $api_mode = false) {
$need_saving = false;
$imgs = $xpath->query("//img[@src]");
foreach ($imgs as $img) {
- $new_src = $this->rewrite_url_if_needed($img->getAttribute("src"), 0, $proxy_all);
+ $new_src = $this->rewrite_url_if_needed($img->getAttribute("src"), $proxy_all);
if ($new_src != $img->getAttribute("src")) {
$img->setAttribute("src", $new_src);
+ $img->removeAttribute("srcset");
$need_saving = true;
}
foreach ($vids as $vid) {
if ($vid->hasAttribute("poster")) {
- $new_src = $this->rewrite_url_if_needed($vid->getAttribute("poster"), 0, $proxy_all);
+ $new_src = $this->rewrite_url_if_needed($vid->getAttribute("poster"), $proxy_all);
if ($new_src != $vid->getAttribute("poster")) {
$vid->setAttribute("poster", $new_src);
$vsrcs = $xpath->query("source", $vid);
foreach ($vsrcs as $vsrc) {
- $new_src = $this->rewrite_url_if_needed($vsrc->getAttribute("src"), 1, $proxy_all);
+ $new_src = $this->rewrite_url_if_needed($vsrc->getAttribute("src"), $proxy_all);
if ($new_src != $vsrc->getAttribute("src")) {
$vid->setAttribute("src", $new_src);
$proxy_all = $this->host->get($this, "proxy_all");
print_checkbox("proxy_all", $proxy_all);
+ print " <label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label><br/>";
- print " <label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label>";
+ $disable_cache = $this->host->get($this, "disable_cache");
+ print_checkbox("disable_cache", $disable_cache);
+ print " <label for=\"disable_cache\">" . __("Don't cache files locally.") . "</label>";
print "<p>"; print_button("submit", __("Save"));
function save() {
$proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]) == "true";
+ $disable_cache = checkbox_to_sql_bool($_POST["disable_cache"]) == "true";
- $this->host->set($this, "proxy_all", $proxy_all);
+ $this->host->set($this, "proxy_all", $proxy_all, false);
+ $this->host->set($this, "disable_cache", $disable_cache);
echo __("Configuration saved");
}
git.wh0rd.org / tt-rss.git / blobdiff