wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the last url in the redirection chain can actually also be a redirection (e.g. if it's one of our /attachment/{file_id} links)

Browse Source
This commit is contained in:
hannes 2016-01-29 00:34:32 +00:00
parent d94f9031ff
commit efd2326a29
1 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
classes/File_redirection.php
View File

@ -170,56 +170,78 @@ 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 {
try { $f = File::getKV('id',$r->file_id);
$f = File::getKV('id',$r->file_id); $r->file = $f;
$r->file = $f; $r->redir_url = $f->url;
$r->redir_url = $f->url; } catch (NoResultException $e) {
} catch (NoResultException $e) { // Invalid entry, delete and run again
// Invalid entry, delete and run again 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...");
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."); $r->delete();
$r->delete(); return self::where($in_url);
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()) try {
if($redir_info['url'] != $in_url) { $f = File::getKV('id',$r->file_id);
try { $redir->file = $f;
$file_redir = File_redirection::getByUrl($in_url); $redir->redir_url = $f->url;
} catch (NoResultException $e) { } catch (NoResultException $e) {
$file_redir = new File_redirection(); // Invalid entry in File_redirection, delete and run again
$file_redir->urlhash = File::hashurl($in_url); 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->url = $in_url; $r->delete();
$file_redir->file_id = $redir->file->getID(); return self::where($in_url);
$file_redir->insert(); }
$file_redir->redir_url = $redir->file->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;
} }
} }