From 03d1001bce1a6d3ba0cce77199a6e1ad686e8273 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Mon, 23 Feb 2015 18:44:50 +0100 Subject: [PATCH 1/1] Closes #4 Remove block feature --- admin.php | 28 ---- install.php | 2 +- lib/config.original.php | 4 - lib/functions.php | 343 ---------------------------------------- lib/lang/fr.php | 11 -- lib/settings.php | 1 - script.php | 114 ------------- 7 files changed, 1 insertion(+), 502 deletions(-) diff --git a/admin.php b/admin.php index 80b18b1..a91d529 100644 --- a/admin.php +++ b/admin.php @@ -136,26 +136,6 @@ require (JIRAFEAU_ROOT . 'lib/template/header.php'); - -
- - - - - - - - - - -
- -
@@ -237,14 +217,6 @@ if (isset ($_POST['action'])) echo t('Number of cleaned files') . ' : ' . $total; echo '

'; } - elseif (strcmp ($_POST['action'], 'clean_block') == 0) - { - $total = jirafeau_admin_clean_block (); - echo '
' . NL; - echo '

'; - echo t('Number of cleaned files') . ' : ' . $total; - echo '

'; - } elseif (strcmp ($_POST['action'], 'list') == 0) { jirafeau_admin_list ("", "", ""); diff --git a/install.php b/install.php index 3bfbea8..41b25fc 100644 --- a/install.php +++ b/install.php @@ -101,7 +101,7 @@ jirafeau_check_var_dir ($path) $path . '
' . $solution_str . '
' . $mkdir_str2); - foreach (array ('files', 'links', 'async', 'block') as $subdir) + foreach (array ('files', 'links', 'async') as $subdir) { $subpath = $path.$subdir; diff --git a/lib/config.original.php b/lib/config.original.php index d955d19..fefd61e 100644 --- a/lib/config.original.php +++ b/lib/config.original.php @@ -43,10 +43,6 @@ $cfg['preview'] = true; * true: Will show a download page (with preview if permited and possible). * false: Will directly download file or preview (if permited and possible). */ $cfg['download_page'] = false; -/* Block feature: - The scripting interface can propose to create, read, write, delete blocks - of data. */ -$cfg['enable_blocks'] = false; /* Encryption feature. disable it by default. * By enabling it, file-level deduplication won't work. */ $cfg['enable_crypt'] = false; diff --git a/lib/functions.php b/lib/functions.php index 1e5b083..459587d 100644 --- a/lib/functions.php +++ b/lib/functions.php @@ -524,9 +524,6 @@ function check_errors ($cfg) if (!is_writable (VAR_ASYNC)) add_error (t('The async directory is not writable!'), VAR_ASYNC); - - if (!is_writable (VAR_BLOCK)) - add_error (t('The block directory is not writable!'), VAR_BLOCK); } /** @@ -960,346 +957,6 @@ jirafeau_async_end ($ref, $code, $crypt, $link_name_length) return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key); } -/** - * Delete a block. - * @param $id identifier of the block. - */ -function -jirafeau_block_delete_ ($id) -{ - $p = VAR_BLOCK . s2p ($id); - if (!file_exists ($p)) - return; - - if (file_exists ($p . $id)) - unlink ($p . $id); - if (file_exists ($p . $id . '_infos')) - unlink ($p . $id . '_infos'); - $parse = $p; - $scan = array(); - while (file_exists ($parse) - && ($scan = scandir ($parse)) - && count ($scan) == 2 // '.' and '..' folders => empty. - && basename ($parse) != basename (VAR_BLOCK)) - { - rmdir ($parse); - $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1); - } -} - -/** - * Create a file filled with zeros. - * @param $size size of the file. - * @return a string corresponding to an id or the string "Error" - */ -function -jirafeau_block_init ($size) -{ - if (!ctype_digit ($size) || $size <= 0) - return "Error"; - - /* Create folder. */ - $id; - do - { - $id = jirafeau_gen_random (32); - $p = VAR_BLOCK . s2p ($id); - } while (file_exists ($p)); - @mkdir ($p, 0755, true); - if (!file_exists ($p)) - { - echo "Error"; - return; - } - - /* Create block. */ - $p .= $id; - $h = fopen ($p, 'w'); - $fill = str_repeat ("\0", 1024); - for ($cnt = 0; $cnt < $size; $cnt += 1024) - { - if ($size - $cnt < 1024) - $fill = str_repeat ("\0", $size - $cnt); - if (fwrite ($h, $fill) === false) - { - fclose ($h); - jirafeau_block_delete_ ($id); - return "Error"; - } - } - fclose ($h); - - /* Generate a write/delete code. */ - $code = jirafeau_gen_random (12); - - /* Add block infos. */ - if (file_put_contents ($p . '_infos', date ('U') . NL . $size . NL . $code) === FALSE) - { - jirafeau_block_delete_ ($id); - return "Error"; - } - - return $id . NL . $code; -} - -/** Get block size in bytes. - * @param $id identifier of the block - * @return block size in bytes - */ -function -jirafeau_block_get_size ($id) -{ - $p = VAR_BLOCK . s2p ($id) . $id; - if (!file_exists ($p)) - return "Error"; - - /* Check date. */ - $f = file ($p . '_infos'); - $date = trim ($f[0]); - $block_size = trim ($f[1]); - $stored_code = trim ($f[2]); - /* Update date. */ - if (date ('U') - $date > JIRAFEAU_HOUR - && date ('U') - $date < JIRAFEAU_MONTH) - { - if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE) - { - jirafeau_block_delete_ ($id); - return "Error"; - } - } - /* Remove data. */ - elseif (date ('U') - $date >= JIRAFEAU_MONTH) - { - echo date ('U'). " $date "; - jirafeau_block_delete_ ($id); - return "Error"; - } - - return $block_size; -} - -/** - * Read some data in a block. - * @param $id identifier of the block - * @param $start where to read data (starting from zero). - * @param $length length to read. - * @return echo data - */ -function -jirafeau_block_read ($id, $start, $length) -{ - if (!ctype_digit ($start) || $start < 0 - || !ctype_digit ($length) || $length <= 0) - { - echo "Error"; - return; - } - - $p = VAR_BLOCK . s2p ($id) . $id; - if (!file_exists ($p)) - { - echo "Error"; - return; - } - - /* Check date. */ - $f = file ($p . '_infos'); - $date = trim ($f[0]); - $block_size = trim ($f[1]); - $stored_code = trim ($f[2]); - /* Update date. */ - if (date ('U') - $date > JIRAFEAU_HOUR - && date ('U') - $date < JIRAFEAU_MONTH) - { - if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE) - { - jirafeau_block_delete_ ($id); - echo "Error"; - return; - } - } - /* Remove data. */ - elseif (date ('U') - $date >= JIRAFEAU_MONTH) - { - echo date ('U'). " $date "; - jirafeau_block_delete_ ($id); - echo "Error"; - return; - } - - if ($start + $length > $block_size) - { - echo "Error"; - return; - } - - /* Read content. */ - header ('Content-Length: ' . $length); - header ('Content-Disposition: attachment'); - - $r = fopen ($p, 'r'); - if (fseek ($r, $start) != 0) - { - echo "Error"; - return; - } - $c = 1024; - for ($cnt = 0; $cnt < $length && !feof ($r); $cnt += 1024) - { - if ($length - $cnt < 1024) - $c = $length - $cnt; - print fread ($r, $c); - ob_flush(); - } - fclose ($r); -} - -/** - * Write some data in a block. - * @param $id identifier of the block - * @param $start where to writing data (starting from zero). - * @param $data data to write. - * @param $code code to allow writing. - * @return string "Ok" or string "Error". - */ -function -jirafeau_block_write ($id, $start, $data, $code) -{ - if (!ctype_digit ($start) || $start < 0 - || strlen ($code) == 0) - return "Error"; - - $p = VAR_BLOCK . s2p ($id) . $id; - if (!file_exists ($p)) - return "Error"; - - /* Check date. */ - $f = file ($p . '_infos'); - $date = trim ($f[0]); - $block_size = trim ($f[1]); - $stored_code = trim ($f[2]); - /* Update date. */ - if (date ('U') - $date > JIRAFEAU_HOUR - && date ('U') - $date < JIRAFEAU_MONTH) - { - if (file_put_contents ($p . '_infos', date ('U') . NL . $block_size . NL . $stored_code) === FALSE) - { - jirafeau_block_delete_ ($id); - return "Error"; - } - } - /* Remove data. */ - elseif (date ('U') - $date >= JIRAFEAU_MONTH) - { - jirafeau_block_delete_ ($id); - return "Error"; - } - - /* Check code. */ - if ($stored_code != $code) - { - echo "Error"; - return; - } - - /* Check data. */ - $size = $data['size']; - if ($size <= 0) - return "Error"; - if ($start + $size > $block_size) - return "Error"; - - /* Open data. */ - $r = fopen ($data['tmp_name'], 'r'); - - /* Open Block. */ - $w = fopen ($p, 'r+'); - if (fseek ($w, $start) != 0) - return "Error"; - - /* Write content. */ - $c = 1024; - for ($cnt = 0; $cnt <= $size && !feof ($w); $cnt += 1024) - { - if ($size - $cnt < 1024) - $c = $size - $cnt; - $d = fread ($r, $c); - fwrite ($w, $d); - } - fclose ($r); - fclose ($w); - unlink ($data['tmp_name']); - return "Ok"; -} - -/** - * Delete a block. - * @param $id identifier of the block. - * @param $code code to allow writing. - * @return string "Ok" or string "Error". - */ -function -jirafeau_block_delete ($id, $code) -{ - $p = VAR_BLOCK . s2p ($id) . $id; - - if (!file_exists ($p)) - return "Error"; - - $f = file ($p . '_infos'); - $date = trim ($f[0]); - $block_size = trim ($f[1]); - $stored_code = trim ($f[2]); - - if ($code != $stored_code) - return "Error"; - - jirafeau_block_delete_ ($id); - return "Ok"; -} - -/** - * Clean old unused blocks. - * @return number of cleaned blocks. - */ -function -jirafeau_admin_clean_block () -{ - $count = 0; - /* Get all blocks. */ - $stack = array (VAR_BLOCK); - while (($d = array_shift ($stack)) && $d != NULL) - { - $dir = scandir ($d); - - foreach ($dir as $node) - { - if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0) - continue; - - if (is_dir ($d . $node)) - { - /* Push new found directory. */ - $stack[] = $d . $node . '/'; - } - elseif (is_file ($d . $node) && preg_match ('/\_infos/i', "$node")) - { - /* Read block informations. */ - $f = file ($d . $node); - $date = trim ($f[0]); - $block_size = trim ($f[1]); - if (date ('U') - $date >= JIRAFEAU_MONTH) - { - jirafeau_block_delete_ (substr($node, 0, -6)); - $count++; - } - } - } - } - return $count; -} - function jirafeau_crypt_create_iv($base, $size) { diff --git a/lib/lang/fr.php b/lib/lang/fr.php index 9dcb524..62bc164 100644 --- a/lib/lang/fr.php +++ b/lib/lang/fr.php @@ -80,7 +80,6 @@ $tr = array ( 'step' => 'étape', 'out of' => 'sur', 'Administration password' => 'Mot de passe d\'administration', - 'Clean unused blocks' => 'Nettoie les bloques inutilisés', 'Finalisation' => 'Finalisation', 'Jirafeau is setting the website according to the configuration you provided.' => 'Jirafeau se configure selon les paramêtres donnés', 'Previous step' => 'Etape précedente', @@ -163,16 +162,6 @@ $tr = array ( 'Push data during asynchronous transfert' => 'Envoyer des données pendant un transfert asynchrone', 'Returns the next code to use.' => 'Renvoie le prochain code à utiliser.', 'Finalize asynchronous transfert' => 'Finaliser un transfert asynchrone', - 'Create a data block' => 'Creer un bloque de données', - 'This interface permits to create a block of data filled with zeros.' => 'Cette interface permet de creer un bloque de données remplies de zeros.', - 'You can read selected parts, write (using a code) and delete the block.' => 'Vous pouvez lire, écrire (en utilisant un code) et supprimer le bloque.', - 'Blocks may be removed after a month of non usage.' => 'Les bloques non utilisés depuis plus d\'un mois seront probablement supprimés.', - 'Get block size' => 'Récupérer la taille d\'un bloque', - 'Read data in a block' => 'Lire des données dans un bloque', - 'Write data in a block' => 'Ecrire des données dans un bloque', - 'First line is a block id the second line the edit/delete code.' => 'La premiere ligne est l\'identifiant du bloque, la seconde est son code d\'écriture/suppression.', - 'This will return asked data or "Error" string.' => 'Retourne les données ou la chaine "Error".', - 'Delete a block' => 'Supprimer un bloque', 'This will return "Ok" or "Error" string.' => 'Retourn la chaine "Ok" ou "Error".', ); ?> diff --git a/lib/settings.php b/lib/settings.php index 133113d..74bf771 100644 --- a/lib/settings.php +++ b/lib/settings.php @@ -24,7 +24,6 @@ define ('JIRAFEAU_VERSION', '1.0'); define ('VAR_FILES', $cfg['var_root'] . 'files/'); define ('VAR_LINKS', $cfg['var_root'] . 'links/'); define ('VAR_ASYNC', $cfg['var_root'] . 'async/'); -define ('VAR_BLOCK', $cfg['var_root'] . 'block/'); /* Useful constants. */ if (!defined ('NL')) diff --git a/script.php b/script.php index d109d4a..09c7a8c 100644 --- a/script.php +++ b/script.php @@ -184,66 +184,6 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0) echo '

' . t('This will return brut text content.') . ' ' . t('First line is the download reference and the second line the delete code.') . '

'; - if ($cfg['enable_blocks']) - { - echo '

' . t('Create a data block') . ':

'; - echo '

'; - echo t('This interface permits to create a block of data filled with zeros.') . - ' ' . t('You can read selected parts, write (using a code) and delete the block.') . - ' ' . t('Blocks may be removed after a month of non usage.'); - echo '

'; - echo '

'; - echo t('Send a GET query to') . ': ' . $web_root . 'script.php?init_block
'; - echo '
'; - echo t('Parameters') . ':
'; - echo "size=size_in_bytes (" . t('Required') . ")
"; - echo '

'; - echo '

' . t('This will return brut text content.') . ' ' . - t('First line is a block id the second line the edit/delete code.') . '

'; - - echo '

' . t('Get block size') . ':

'; - echo '

'; - echo t('Send a GET query to') . ': ' . $web_root . 'script.php?get_block_size
'; - echo '
'; - echo t('Parameters') . ':
'; - echo "id=block_id (" . t('Required') . ")
"; - echo '

'; - echo '

' . t('This will return asked data or "Error" string.') . '

'; - - echo '

' . t('Read data in a block') . ':

'; - echo '

'; - echo t('Send a GET query to') . ': ' . $web_root . 'script.php?read_block
'; - echo '
'; - echo t('Parameters') . ':
'; - echo "id=block_id (" . t('Required') . ")
"; - echo "start=byte_position_starting_from_zero (" . t('Required') . ")
"; - echo "length=length_to_read_in_bytes (" . t('Required') . ")
"; - echo '

'; - echo '

' . t('This will return asked data or "Error" string.') . '

'; - - echo '

' . t('Write data in a block') . ':

'; - echo '

'; - echo t('Send a GET query to') . ': ' . $web_root . 'script.php?write_block
'; - echo '
'; - echo t('Parameters') . ':
'; - echo "id=block_id (" . t('Required') . ")
"; - echo "code=block_code (" . t('Required') . ")
"; - echo "start=byte_position_starting_from_zero (" . t('Required') . ")
"; - echo "data=data_to_write (" . t('Required') . ")
"; - echo '

'; - echo '

' . t('This will return "Ok" or "Error" string.') . '

'; - - echo '

' . t('Delete a block') . ':

'; - echo '

'; - echo t('Send a GET query to') . ': ' . $web_root . 'script.php?delete_block
'; - echo '
'; - echo t('Parameters') . ':
'; - echo "id=block_id (" . t('Required') . ")
"; - echo "code=block_code (" . t('Required') . ")
"; - echo '

'; - echo '

' . t('This will return "Ok" or "Error" string.') . '

'; - } - echo '
'; require (JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; @@ -604,60 +544,6 @@ elseif (isset ($_GET['end_async'])) else echo jirafeau_async_end ($_POST['ref'], $_POST['code'], $cfg['enable_crypt'], $cfg['link_name_lenght']); } -/* Initialize block. */ -elseif (isset ($_GET['init_block']) && $cfg['enable_blocks']) -{ - if (jirafeau_has_upload_password ($cfg) && - (!isset ($_POST['upload_password']) || - !jirafeau_challenge_upload_password ($cfg, $_POST['upload_password']))) - { - echo "Error"; - exit; - } - - if (!isset ($_POST['size'])) - echo "Error"; - else - echo jirafeau_block_init ($_POST['size']); -} -/* Get block size. */ -elseif (isset ($_GET['get_block_size']) && $cfg['enable_blocks']) -{ - if (!isset ($_POST['id'])) - echo "Error"; - else - echo jirafeau_block_get_size ($_POST['id']); -} -/* Read data in block. */ -elseif (isset ($_GET['read_block']) && $cfg['enable_blocks']) -{ - if (!isset ($_POST['id']) - || !isset ($_POST['start']) - || !isset ($_POST['length'])) - echo "Error"; - else - jirafeau_block_read ($_POST['id'], $_POST['start'], $_POST['length']); -} -/* Write data in block. */ -elseif (isset ($_GET['write_block']) && $cfg['enable_blocks']) -{ - if (!isset ($_POST['id']) - || !isset ($_POST['start']) - || !isset ($_FILES['data']) - || !isset ($_POST['code'])) - echo "Error"; - else - echo jirafeau_block_write ($_POST['id'], $_POST['start'], $_FILES['data'], $_POST['code']); -} -/* Delete block. */ -elseif (isset ($_GET['delete_block']) && $cfg['enable_blocks']) -{ - if (!isset ($_POST['id']) - || !isset ($_POST['code'])) - echo "Error"; - else - echo jirafeau_block_delete ($_POST['id'], $_POST['code']); -} else echo "Error"; exit; -- 2.34.1