external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-11 18:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

added delete codes and fixed various bugs related to custom hashes

Browse Source
This commit is contained in:
Chris
2018-12-25 11:34:43 +01:00
parent bf13df48aa
commit b66a1f2a55
7 changed files with 106 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -24,6 +24,7 @@ Table of contents
## Breaking changes
- New API system. Only single file uploads now via /api/upload.php (POST var name is "file"). [read more..](/rtfm/API.md)
- Data directory changed from ```upload``` to ```data```
## Status

16
api/upload.php
View File

@@ -28,9 +28,10 @@ if ($_FILES['file']["error"] == UPLOAD_ERR_OK)
{
//check for duplicates
$sha1 = sha1_file($_FILES['file']["tmp_name"]);
$hash = sha1Exists($sha1);
if($hash)
exit(json_encode(array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash)));
$ehash = sha1Exists($sha1);
if($ehash && file_exists(ROOT.DS.'data'.DS.$ehash.DS.$ehash))
exit(json_encode(array('status'=>'ok','hash'=>$ehash,'url'=>URL.$ehash)));
//get the file type
$type = getTypeOfFile($_FILES['file']["tmp_name"]);
@@ -56,11 +57,18 @@ if ($_FILES['file']["error"] == UPLOAD_ERR_OK)
if(!$answer)
$answer = array('status'=>'err','reason'=>'Unsupported filetype');
if($answer['hash'])
if($answer['hash'] && $answer['status']=='ok')
{
//add this sha1 to the list
addSha1($answer['hash'],$sha1);
if(getDeleteCodeOfHash($answer['hash']))
{
$answer['delete_code'] = getDeleteCodeOfHash($answer['hash']);
$answer['delete_url'] = URL.'delete_'.getDeleteCodeOfHash($answer['hash']).'/'.$answer['hash'];
}
// Lets' check all storage controllers and tell them that a new file was uploaded
$sc = getStorageControllers();
foreach($sc as $contr)

23
content-controllers/image/image.controller.php
View File

@@ -28,8 +28,6 @@ class ImageController implements ContentController
$res = imagecreatefromjpeg($tmpfile);
imagejpeg($res, $tmpfile, (defined('JPEG_COMPRESSION')?JPEG_COMPRESSION:90));
$ext = 'jpg';
$newsha1 = sha1_file($tmpfile);
break;
default:
@@ -42,26 +40,13 @@ class ImageController implements ContentController
}
else
{
$hash.='.'.$ext;
if(!endswith($hash,'.'.$ext))
$hash.='.'.$ext;
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
if($newsha1)
addSha1($hash,$newsha1);
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
storeFile($tmpfile,$hash,true);
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}

15
content-controllers/text/text.controller.php
View File

@@ -43,21 +43,10 @@ class TextController implements ContentController
if(!endswith($hash,'.txt'))
$hash.='.txt';
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
storeFile($tmpfile,$hash,true);
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}

15
content-controllers/video/video.controller.php
View File

@@ -69,24 +69,13 @@ class VideoController implements ContentController
{
$hash.='.mp4';
if(isExistingHash($hash))
return array('status'=>'err','reason'=>'Custom hash already exists');
return array('status'=>'err','hash'=>$hash,'reason'=>'Custom hash already exists');
}
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($tmpfile, $file);
unlink($tmpfile);
storeFile($tmpfile,$hash,true);
if(!$this->rightEncodedMP4($file))
system("nohup php ".ROOT.DS.'tools'.DS.'re-encode_mp4.php force '.$hash." > /dev/null 2> /dev/null &");
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
return array('status'=>'ok','hash'=>$hash,'url'=>URL.$hash);
}

86
inc/core.php
View File

@@ -37,6 +37,7 @@ function architect($url)
$hash = $el;
break;
}
// if we don't have a hash yet but the element looks like it could be a hash
if($hash === false && mightBeAHash($el))
{
if(!$sc)
@@ -48,7 +49,7 @@ function architect($url)
{
$c->pullFile($el);
$hash = $el;
break;
break; // we brake here because we already have the file. no need to check other storage controllers
}
}
}
@@ -62,7 +63,25 @@ function architect($url)
}
else
{
//ok we have a valid hash. Now let's check the extension to find out which controller will be handling this request
//ok we have a valid hash.
//is the user requesting this file to be deleted?
foreach($u as $el)
{
if(startsWith($el,'delete_'))
{
$code = substr($el,7);
//@todo: allow MASTER_DELETE_IP to be CIDR range or coma separated
if(getDeleteCodeOfHash($hash)==$code || (defined('MASTER_DELETE_CODE') && MASTER_DELETE_CODE==$code ) || (defined('MASTER_DELETE_IP') && MASTER_DELETE_IP==getUserIP()) )
{
deleteHash($hash);
exit($hash.' deleted successfully');
}
}
}
//Now let's check the extension to find out which controller will be handling this request
$extension = pathinfo($hash, PATHINFO_EXTENSION);
@@ -384,4 +403,67 @@ function getStorageControllers()
}
return $controllers;
}
function rrmdir($dir) {
if (is_dir($dir)) {
$objects = scandir($dir);
foreach ($objects as $object) {
if ($object != "." && $object != "..") {
if (is_dir($dir."/".$object))
rrmdir($dir."/".$object);
else
unlink($dir."/".$object);
}
}
rmdir($dir);
}
}
function storeFile($srcfile,$hash,$deleteoriginal=false)
{
if(is_dir(ROOT.DS.'data'.DS.$hash) && file_exists(ROOT.DS.'data'.DS.$hash.DS.$hash)) return;
mkdir(ROOT.DS.'data'.DS.$hash);
$file = ROOT.DS.'data'.DS.$hash.DS.$hash;
copy($srcfile, $file);
if($deleteoriginal===true)
unlink($srcfile);
addSha1($hash,sha1_file($file));
//creating a delete code
$deletecode = getRandomString(32);
$fh = fopen(ROOT.DS.'data'.DS.$hash.DS.'deletecode', 'w');
fwrite($fh, $deletecode);
fclose($fh);
if(defined('LOG_UPLOADER') && LOG_UPLOADER)
{
$fh = fopen(ROOT.DS.'data'.DS.'uploads.txt', 'a');
fwrite($fh, time().';'.$url.';'.$hash.';'.getUserIP()."\n");
fclose($fh);
}
}
function getDeleteCodeOfHash($hash)
{
return file_get_contents(ROOT.DS.'data'.DS.$hash.DS.'deletecode');
}
function deleteHash($hash)
{
//delete all local images
rrmdir(ROOT.DS.'data'.DS.$hash);
//tell every storage controller to delete theirs as well
$sc = getStorageControllers();
foreach($sc as $contr)
{
$c = new $contr();
if($c->isEnabled()===true && $c->hashExists($el))
{
$c->deleteFile($el);
}
}
}

6
storage-controllers/altfolder.controller.php
View File

@@ -18,11 +18,7 @@ class AltfolderStorage implements StorageController
$altname=ALT_FOLDER.DS.$hash;
if(file_exists($altname))
{
mkdir(ROOT.DS.'data'.DS.$hash);
copy($altname,ROOT.DS.'data'.DS.$hash.DS.$hash);
//and don't forget to add it to the duplicate detection system
addSha1($hash,sha1_file($altname));
storeFile($altname,$hash,false);
}
}