Ref string MUST be 32 characters, code string MUST be 4 characters.
Code string MUST be a valid hex string.
Compare code using hash_equals().
/* Create temporary folder. */
$ref = '';
$p = '';
/* Create temporary folder. */
$ref = '';
$p = '';
- $code = jirafeau_gen_random(4);
+ $code = jirafeau_gen_random(JIRAFEAU_ASYNC_CODE_LENGTH);
- $ref = jirafeau_gen_random(32);
+ $ref = jirafeau_gen_random(JIRAFEAU_ASYNC_REF_LENGTH);
$p = VAR_ASYNC . s2p($ref);
} while (file_exists($p));
@mkdir($p, 0755, true);
$p = VAR_ASYNC . s2p($ref);
} while (file_exists($p));
@mkdir($p, 0755, true);
*/
function jirafeau_async_push($ref, $data, $code, $max_file_size)
{
*/
function jirafeau_async_push($ref, $data, $code, $max_file_size)
{
+ $ref = trim($ref);
+ $code = trim($code);
+
/* Validate ref string. */
/* Validate ref string. */
- if (!ctype_xdigit(trim($ref))) {
+ if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) {
return "Error: Malformed ref string";
}
return "Error: Malformed ref string";
}
+ /* Validate code string. */
+ if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) {
+ return "Error: Malformed code string";
+ }
+
/* Get async infos. */
$a = jirafeau_get_async_ref($ref);
/* Get async infos. */
$a = jirafeau_get_async_ref($ref);
return "Error: cannot find transfer";
}
return "Error: cannot find transfer";
}
- if ($a['next_code'] != "$code") {
+ if (!hash_equals($a['next_code'], "$code")) {
return "Error: bad transfer code";
}
if ($data['error'] != UPLOAD_ERR_OK) {
return "Error: bad transfer code";
}
if ($data['error'] != UPLOAD_ERR_OK) {
*/
function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_method)
{
*/
function jirafeau_async_end($ref, $code, $crypt, $link_name_length, $file_hash_method)
{
+ $ref = trim($ref);
+ $code = trim($code);
+
/* Validate ref string. */
/* Validate ref string. */
- if (!ctype_xdigit(trim($ref))) {
+ if (!ctype_xdigit($ref) || strlen($ref) != JIRAFEAU_ASYNC_REF_LENGTH) {
return "Error: Malformed ref string";
}
return "Error: Malformed ref string";
}
+ /* Validate code string. */
+ if (!ctype_xdigit($code) || strlen($code) != JIRAFEAU_ASYNC_CODE_LENGTH) {
+ return "Error: Malformed code string";
+ }
+
/* Get async infos. */
$a = jirafeau_get_async_ref($ref);
/* Get async infos. */
$a = jirafeau_get_async_ref($ref);
- if (count($a) == 0
- || $a['next_code'] != "$code") {
- return "Error: bad code for ending transfer";
+
+ /* Check some errors. */
+ if (count($a) == 0) {
+ return "Error: cannot find transfer";
+ if (!hash_equals($a['next_code'], "$code")) {
+ return "Error: bad code for ending transfer";
+ }
/* Generate link infos. */
$p = VAR_ASYNC . s2p($ref) . $ref . "_data";
if (!file_exists($p)) {
/* Generate link infos. */
$p = VAR_ASYNC . s2p($ref) . $ref . "_data";
if (!file_exists($p)) {
define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
define('JIRAFEAU_SODIUM_CHUNKSIZE', 1024);
+define('JIRAFEAU_ASYNC_REF_LENGTH', 32);
+define('JIRAFEAU_ASYNC_CODE_LENGTH', 4);
+
// Define some Sodium constants from newer PHP versions if they are not available
if (extension_loaded('sodium')) {
// Define some Sodium constants from newer PHP versions if they are not available
if (extension_loaded('sodium')) {