eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'foolproof_file_redirection_branch' into 'nightly' 

Foolproof file redirection

This solves an issue when our internal /attachment/{file_id} links are shortened with an remote shorteners (which caused the /attachment/{file_id} links to be saved to the File table and a thumbnail of a thumbnail being generated)

See merge request !98
This commit is contained in:
mmn 2016-02-26 12:49:10 +00:00
parent a3c5ef59d6 501d081d3b
commit 722ff4d9c0
2 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/File.php
View File

@ -106,6 +106,19 @@ class File extends Managed_DataObject
// We don't have the file's URL since before, so let's continue. // We don't have the file's URL since before, so let's continue.
} }
// if the given url is an local attachment url and the id already exists, don't
// save a new file record. This should never happen, but let's make it foolproof
$attachment_path = common_path('attachment/');
if(strpos($given_url,$attachment_path) == 0) {
$possible_file_id = substr($given_url,strlen($attachment_path));
if(is_numeric($possible_file_id)) {
$file = File::getKV('id',$possible_file_id);
if($file instanceof File) {
return $file;
}
}
}
$file = new File; $file = new File;
$file->url = $given_url; $file->url = $given_url;
if (!empty($redir_data['protected'])) $file->protected = $redir_data['protected']; if (!empty($redir_data['protected'])) $file->protected = $redir_data['protected'];

93
classes/File_redirection.php
View File

@ -172,56 +172,83 @@ class File_redirection extends Managed_DataObject
try { try {
$r = File_redirection::getByUrl($in_url); $r = File_redirection::getByUrl($in_url);
if($r instanceof File_redirection) {
try { $f = File::getKV('id',$r->file_id);
$f = File::getKV('id',$r->file_id);
$r->file = $f; if($file instanceof File) {
$r->redir_url = $f->url; $r->file = $f;
} catch (NoResultException $e) { $r->redir_url = $f->url;
// Invalid entry, delete and run again } else {
common_log(LOG_ERR, "Could not find File with id=".$r->file_id." referenced in File_redirection, deleting File redirection entry and creating new File and File_redirection entries."); // Invalid entry, delete and run again
$r->delete(); common_log(LOG_ERR, "Could not find File with id=".$r->file_id." referenced in File_redirection, deleting File redirection entry and and trying again...");
return self::where($in_url); $r->delete();
} return self::where($in_url);
return $r;
} }
// File_redirecion and File record found, return both
return $r;
} catch (NoResultException $e) { } catch (NoResultException $e) {
// File_redirecion record not found, but this might be a direct link to a file
try { try {
$f = File::getByUrl($in_url); $f = File::getByUrl($in_url);
$redir->file_id = $f->id; $redir->file_id = $f->id;
$redir->file = $f; $redir->file = $f;
return $redir; return $redir;
} catch (NoResultException $e) { } catch (NoResultException $e) {
// Oh well, let's keep going // nope, this was not a direct link to a file either, let's keep going
} }
} }
if ($discover) { if ($discover) {
// try to follow redirects and get the final url
$redir_info = File_redirection::lookupWhere($in_url); $redir_info = File_redirection::lookupWhere($in_url);
if(is_string($redir_info)) { if(is_string($redir_info)) {
$redir_info = array('url' => $redir_info); $redir_info = array('url' => $redir_info);
} }
// Save the file if we don't have it already // the last url in the redirection chain can actually be a redirect!
$redir->file = File::saveNew($redir_info,$redir_info['url']); // this is the case with local /attachment/{file_id} links
// in that case we have the file id already
// If this is a redirection, save it try {
// (if it hasn't been saved yet by some other process while we we $r = File_redirection::getByUrl($redir_info['url']);
// were running lookupWhere())
if($redir_info['url'] != $in_url) { $f = File::getKV('id',$r->file_id);
try {
$file_redir = File_redirection::getByUrl($in_url); if($f instanceof File) {
} catch (NoResultException $e) { $redir->file = $f;
$file_redir = new File_redirection(); $redir->redir_url = $f->url;
$file_redir->urlhash = File::hashurl($in_url); } else {
$file_redir->url = $in_url; // Invalid entry in File_redirection, delete and run again
$file_redir->file_id = $redir->file->getID(); common_log(LOG_ERR, "Could not find File with id=".$r->file_id." referenced in File_redirection, deleting File_redirection entry and trying again...");
$file_redir->insert(); $r->delete();
$file_redir->redir_url = $redir->file->url; return self::where($in_url);
} }
} catch (NoResultException $e) {
// save the file now when we know that we don't have it in File_redirection
try {
$redir->file = File::saveNew($redir_info,$redir_info['url']);
} catch (ServerException $e) {
common_log(LOG_ERR, $e);
}
}
// If this is a redirection and we have a file to redirect to, save it
// (if it doesn't exist in File_redirection already)
if($redir->file instanceof File && $redir_info['url'] != $in_url) {
try {
$file_redir = File_redirection::getByUrl($in_url);
} catch (NoResultException $e) {
$file_redir = new File_redirection();
$file_redir->urlhash = File::hashurl($in_url);
$file_redir->url = $in_url;
$file_redir->file_id = $redir->file->getID();
$file_redir->insert();
$file_redir->redir_url = $redir->file->url;
}
$file_redir->file = $redir->file; $file_redir->file = $redir->file;
return $file_redir; return $file_redir;
} }
} }