marc
/
CiviProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for a mosaico parameter; change URL if it's found; strip out chunked transfer header

This commit is contained in:
Jon goldberg 2017-04-26 15:54:13 -04:00
parent f1ed911979
commit 32966f0802
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
proxy/file.php
View File

@ -10,16 +10,17 @@
require_once "config.php"; require_once "config.php";
require_once "proxy.php"; require_once "proxy.php";
// basic restraints
$valid_parameters = array( 'id' => 'string', 'mosaico' => 'int' );
$parameters = civiproxy_get_parameters($valid_parameters);
// see if file caching is enabled // see if file caching is enabled
if (!$target_file) civiproxy_http_error("Feature disabled", 405); if ((!$target_file && !$parameters['mosaico']) || (!$target_mosaico_file && $parameters['mosaico'])) {
civiproxy_http_error("Feature disabled", 405);
}
// basic check // basic check
civiproxy_security_check('file'); civiproxy_security_check('file');
// basic restraints
$valid_parameters = array( 'id' => 'string' );
$parameters = civiproxy_get_parameters($valid_parameters);
// check if id specified // check if id specified
if (empty($parameters['id'])) civiproxy_http_error("Resource not found"); if (empty($parameters['id'])) civiproxy_http_error("Resource not found");
@ -66,9 +67,13 @@ if ($header && $data) {
print $data; print $data;
exit(); exit();
} }
// if we get here, we have a cache miss => load // if we get here, we have a cache miss => load
if ($parameters['mosaico'] == 1) {
$url = $target_mosaico_file . $parameters['id'];
}
else {
$url = $target_file . $parameters['id']; $url = $target_file . $parameters['id'];
}
// error_log("CACHE MISS. LOADING $url"); // error_log("CACHE MISS. LOADING $url");
$curlSession = curl_init(); $curlSession = curl_init();
@ -92,7 +97,6 @@ if (curl_error($curlSession)) {
error_log(curl_error($curlSession)); error_log(curl_error($curlSession));
civiproxy_http_error(curl_error($curlSession), curl_errno($curlSession)); civiproxy_http_error(curl_error($curlSession), curl_errno($curlSession));
} }
// process the results // process the results
$content = explode("\r\n\r\n", $response, 2); $content = explode("\r\n\r\n", $response, 2);
$header = $content[0]; $header = $content[0];
@ -107,8 +111,10 @@ $file_cache->save($body, $data_key);
// and reply // and reply
foreach ($header_lines as $header_line) { foreach ($header_lines as $header_line) {
if($header_line !== 'Transfer-Encoding: chunked ') {
header($header_line); header($header_line);
} }
}
print $body; print $body;
curl_close ($curlSession); curl_close ($curlSession);