Cavemanon/cavepaintings
7
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

[core] roll back database transaction when upload fails - fixes #1007

Browse Source
This commit is contained in:
Shish
2024-01-09 21:01:10 +00:00
parent 4d011fa5e5
commit b2f67363a1
9 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/ouroboros_api/main.php
View File

@ -321,7 +321,7 @@ class OuroborosAPI extends Extension
*/
protected function postCreate(OuroborosPost $post, ?string $md5 = '')
{
global $config;
global $config, $database;
$handler = $config->get_string(ImageConfig::UPLOAD_COLLISION_HANDLER);
if (!empty($md5) && !($handler == ImageConfig::COLLISION_MERGE)) {
$img = Image::by_hash($md5);
@ -383,20 +383,20 @@ class OuroborosAPI extends Extension
}
$meta['extension'] = pathinfo($meta['filename'], PATHINFO_EXTENSION);
try {
send_event(new DataUploadEvent($meta['file'], $meta));
$image = Image::by_hash($meta['hash']);
$database->execute("SAVEPOINT upload");
$dae = send_event(new DataUploadEvent($meta['file'], $meta));
$image = $dae->images[0];
if (!is_null($image)) {
$this->sendResponse(200, make_link('post/view/' . $image->id), true);
return;
} else {
// Fail, unsupported file?
$this->sendResponse(500, 'Unknown error');
return;
}
$database->execute("RELEASE SAVEPOINT upload");
} catch (UploadException $e) {
$database->execute("ROLLBACK TO SAVEPOINT upload");
// Cleanup in case shit hit the fan
$this->sendResponse(500, $e->getMessage());
return;
}
}