';
echo '| ' .
- '' . htmlspecialchars($l['file_name']) . '';
+ '' . jirafeau_escape($l['file_name']) . '';
echo ' | ';
- echo '' . $l['mime_type'] . ' | ';
- echo '' . jirafeau_human_size ($l['file_size']) . ' | ';
- echo '' . ($l['time'] == -1 ? '' : strftime ('%c', $l['time'])) .
- ' | ';
+ echo '' . jirafeau_escape($l['mime_type']) . ' | ';
+ echo '' . jirafeau_human_size($l['file_size']) . ' | ';
+ echo '' . ($l['time'] == -1 ? 'â' : jirafeau_get_datetimefield($l['time'])) . ' | ';
echo '';
- if ($l['onetime'] == 'O')
+ if ($l['onetime'] == 'O') {
echo 'Y';
- else
+ } else {
echo 'N';
+ }
echo ' | ';
- echo '' . strftime ('%c', $l['upload_date']) . ' | ';
+ echo '' . jirafeau_get_datetimefield($l['upload_date']) . ' | ';
echo '' . $l['ip'] . ' | ';
echo '' .
- '' .
- '' .
- '' .
' | ';
echo '
';
@@ -656,39 +657,34 @@ jirafeau_admin_list ($name, $file_hash, $link_hash)
* Clean expired files.
* @return number of cleaned files.
*/
-function
-jirafeau_admin_clean ()
+function jirafeau_admin_clean()
{
$count = 0;
/* Get all links files. */
- $stack = array (VAR_LINKS);
- while (($d = array_shift ($stack)) && $d != NULL)
- {
- $dir = scandir ($d);
+ $stack = array(VAR_LINKS);
+ while (($d = array_shift($stack)) && $d != null) {
+ $dir = scandir($d);
- foreach ($dir as $node)
- {
- if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
- preg_match ('/\.tmp/i', "$node"))
+ foreach ($dir as $node) {
+ if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+ preg_match('/\.tmp/i', "$node")) {
continue;
+ }
- if (is_dir ($d . $node))
- {
+ if (is_dir($d . $node)) {
/* Push new found directory. */
$stack[] = $d . $node . '/';
- }
- elseif (is_file ($d . $node))
- {
+ } elseif (is_file($d . $node)) {
/* Read link informations. */
- $l = jirafeau_get_link (basename ($node));
- if (!count ($l))
+ $l = jirafeau_get_link(basename($node));
+ if (!count($l)) {
continue;
- $p = s2p ($l['md5']);
- if ($l['time'] > 0 && $l['time'] < time () || // expired
- !file_exists (VAR_FILES . $p . $l['md5']) || // invalid
- !file_exists (VAR_FILES . $p . $l['md5'] . '_count')) // invalid
- {
- jirafeau_delete_link ($node);
+ }
+ $p = s2p($l['md5']);
+ if ($l['time'] > 0 && $l['time'] < time() || // expired
+ !file_exists(VAR_FILES . $p . $l['md5']) || // invalid
+ !file_exists(VAR_FILES . $p . $l['md5'] . '_count')) { // invalid
+ jirafeau_delete_link($node);
$count++;
}
}
@@ -702,37 +698,32 @@ jirafeau_admin_clean ()
* Clean old async transferts.
* @return number of cleaned files.
*/
-function
-jirafeau_admin_clean_async ()
+function jirafeau_admin_clean_async()
{
$count = 0;
/* Get all links files. */
- $stack = array (VAR_ASYNC);
- while (($d = array_shift ($stack)) && $d != NULL)
- {
- $dir = scandir ($d);
+ $stack = array(VAR_ASYNC);
+ while (($d = array_shift($stack)) && $d != null) {
+ $dir = scandir($d);
- foreach ($dir as $node)
- {
- if (strcmp ($node, '.') == 0 || strcmp ($node, '..') == 0 ||
- preg_match ('/\.tmp/i', "$node"))
+ foreach ($dir as $node) {
+ if (strcmp($node, '.') == 0 || strcmp($node, '..') == 0 ||
+ preg_match('/\.tmp/i', "$node")) {
continue;
+ }
- if (is_dir ($d . $node))
- {
+ if (is_dir($d . $node)) {
/* Push new found directory. */
$stack[] = $d . $node . '/';
- }
- elseif (is_file ($d . $node))
- {
+ } elseif (is_file($d . $node)) {
/* Read async informations. */
- $a = jirafeau_get_async_ref (basename ($node));
- if (!count ($a))
+ $a = jirafeau_get_async_ref(basename($node));
+ if (!count($a)) {
continue;
+ }
/* Delete transferts older than 1 hour. */
- if (time () - $a['last_edited'] > 3600)
- {
- jirafeau_async_delete (basename ($node));
+ if (time() - $a['last_edited'] > 3600) {
+ jirafeau_async_delete(basename($node));
$count++;
}
}
@@ -744,47 +735,47 @@ jirafeau_admin_clean_async ()
* Read async transfert informations
* @return array containing informations.
*/
-function
-jirafeau_get_async_ref ($ref)
+function jirafeau_get_async_ref($ref)
{
- $out = array ();
- $refinfos = VAR_ASYNC . s2p ("$ref") . "$ref";
+ $out = array();
+ $refinfos = VAR_ASYNC . s2p("$ref") . "$ref";
- if (!file_exists ($refinfos))
+ if (!file_exists($refinfos)) {
return $out;
+ }
- $c = file ($refinfos);
- $out['file_name'] = trim ($c[0]);
- $out['mime_type'] = trim ($c[1]);
- $out['key'] = trim ($c[2], NL);
- $out['time'] = trim ($c[3]);
- $out['onetime'] = trim ($c[4]);
- $out['ip'] = trim ($c[5]);
- $out['last_edited'] = trim ($c[6]);
- $out['next_code'] = trim ($c[7]);
+ $c = file($refinfos);
+ $out['file_name'] = trim($c[0]);
+ $out['mime_type'] = trim($c[1]);
+ $out['key'] = trim($c[2], NL);
+ $out['time'] = trim($c[3]);
+ $out['onetime'] = trim($c[4]);
+ $out['ip'] = trim($c[5]);
+ $out['last_edited'] = trim($c[6]);
+ $out['next_code'] = trim($c[7]);
return $out;
}
/**
* Delete async transfert informations
*/
-function
-jirafeau_async_delete ($ref)
+function jirafeau_async_delete($ref)
{
- $p = s2p ("$ref");
- if (file_exists (VAR_ASYNC . $p . $ref))
- unlink (VAR_ASYNC . $p . $ref);
- if (file_exists (VAR_ASYNC . $p . $ref . '_data'))
- unlink (VAR_ASYNC . $p . $ref . '_data');
+ $p = s2p("$ref");
+ if (file_exists(VAR_ASYNC . $p . $ref)) {
+ unlink(VAR_ASYNC . $p . $ref);
+ }
+ if (file_exists(VAR_ASYNC . $p . $ref . '_data')) {
+ unlink(VAR_ASYNC . $p . $ref . '_data');
+ }
$parse = VAR_ASYNC . $p;
$scan = array();
- while (file_exists ($parse)
- && ($scan = scandir ($parse))
- && count ($scan) == 2 // '.' and '..' folders => empty.
- && basename ($parse) != basename (VAR_ASYNC))
- {
- rmdir ($parse);
- $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
+ while (file_exists($parse)
+ && ($scan = scandir($parse))
+ && count($scan) == 2 // '.' and '..' folders => empty.
+ && basename($parse) != basename(VAR_ASYNC)) {
+ rmdir($parse);
+ $parse = substr($parse, 0, strlen($parse) - strlen(basename($parse)) - 1);
}
}
@@ -797,41 +788,39 @@ jirafeau_async_delete ($ref)
* @param $ip ip address of the client
* @return a string containing a temporary reference followed by a code or the string 'Error'
*/
-function
-jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
+function jirafeau_async_init($filename, $type, $one_time, $key, $time, $ip)
{
$res = 'Error';
/* Create temporary folder. */
$ref;
$p;
- $code = jirafeau_gen_random (4);
- do
- {
- $ref = jirafeau_gen_random (32);
- $p = VAR_ASYNC . s2p ($ref);
- } while (file_exists ($p));
- @mkdir ($p, 0755, true);
- if (!file_exists ($p))
- {
+ $code = jirafeau_gen_random(4);
+ do {
+ $ref = jirafeau_gen_random(32);
+ $p = VAR_ASYNC . s2p($ref);
+ } while (file_exists($p));
+ @mkdir($p, 0755, true);
+ if (!file_exists($p)) {
echo 'Error';
return;
}
/* md5 password or empty */
$password = '';
- if (!empty ($key))
- $password = md5 ($key);
+ if (!empty($key)) {
+ $password = md5($key);
+ }
/* Store informations. */
$p .= $ref;
- $handle = fopen ($p, 'w');
- fwrite ($handle,
- str_replace (NL, '', trim ($filename)) . NL .
- str_replace (NL, '', trim ($type)) . NL . $password . NL .
+ $handle = fopen($p, 'w');
+ fwrite($handle,
+ str_replace(NL, '', trim($filename)) . NL .
+ str_replace(NL, '', trim($type)) . NL . $password . NL .
$time . NL . ($one_time ? 'O' : 'R') . NL . $ip . NL .
- time () . NL . $code . NL);
- fclose ($handle);
+ time() . NL . $code . NL);
+ fclose($handle);
return $ref . NL . $code ;
}
@@ -844,20 +833,20 @@ jirafeau_async_init ($filename, $type, $one_time, $key, $time, $ip)
* @param $max_file_size maximum allowed file size
* @return a string containing a next code to use or the string "Error"
*/
-function
-jirafeau_async_push ($ref, $data, $code, $max_file_size)
+function jirafeau_async_push($ref, $data, $code, $max_file_size)
{
/* Get async infos. */
- $a = jirafeau_get_async_ref ($ref);
+ $a = jirafeau_get_async_ref($ref);
/* Check some errors. */
- if (count ($a) == 0
+ if (count($a) == 0
|| $a['next_code'] != "$code"
- || empty ($data['tmp_name'])
- || !is_uploaded_file ($data['tmp_name']))
+ || empty($data['tmp_name'])
+ || !is_uploaded_file($data['tmp_name'])) {
return 'Error';
+ }
- $p = s2p ($ref);
+ $p = s2p($ref);
/* File path. */
$r_path = $data['tmp_name'];
@@ -865,37 +854,34 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
/* Check that file size is not above upload limit. */
if ($max_file_size > 0 &&
- filesize ($r_path) + filesize ($w_path) > $max_file_size * 1024 * 1024)
- {
- jirafeau_async_delete ($ref);
+ filesize($r_path) + filesize($w_path) > $max_file_size * 1024 * 1024) {
+ jirafeau_async_delete($ref);
return 'Error';
}
/* Concatenate data. */
- $r = fopen ($r_path, 'r');
- $w = fopen ($w_path, 'a');
- while (!feof ($r))
- {
- if (fwrite ($w, fread ($r, 1024)) === false)
- {
- fclose ($r);
- fclose ($w);
- jirafeau_async_delete ($ref);
+ $r = fopen($r_path, 'r');
+ $w = fopen($w_path, 'a');
+ while (!feof($r)) {
+ if (fwrite($w, fread($r, 1024)) === false) {
+ fclose($r);
+ fclose($w);
+ jirafeau_async_delete($ref);
return 'Error';
}
}
- fclose ($r);
- fclose ($w);
- unlink ($r_path);
+ fclose($r);
+ fclose($w);
+ unlink($r_path);
/* Update async file. */
- $code = jirafeau_gen_random (4);
- $handle = fopen (VAR_ASYNC . $p . $ref, 'w');
- fwrite ($handle,
+ $code = jirafeau_gen_random(4);
+ $handle = fopen(VAR_ASYNC . $p . $ref, 'w');
+ fwrite($handle,
$a['file_name'] . NL. $a['mime_type'] . NL. $a['key'] . NL .
$a['time'] . NL . $a['onetime'] . NL . $a['ip'] . NL .
- time () . NL . $code . NL);
- fclose ($handle);
+ time() . NL . $code . NL);
+ fclose($handle);
return $code;
}
@@ -907,77 +893,80 @@ jirafeau_async_push ($ref, $data, $code, $max_file_size)
* @param $link_name_length link name length
* @return a string containing the download reference followed by a delete code or the string 'Error'
*/
-function
-jirafeau_async_end ($ref, $code, $crypt, $link_name_length)
+function jirafeau_async_end($ref, $code, $crypt, $link_name_length)
{
/* Get async infos. */
- $a = jirafeau_get_async_ref ($ref);
- if (count ($a) == 0
- || $a['next_code'] != "$code")
+ $a = jirafeau_get_async_ref($ref);
+ if (count($a) == 0
+ || $a['next_code'] != "$code") {
return "Error";
+ }
/* Generate link infos. */
- $p = VAR_ASYNC . s2p ($ref) . $ref . "_data";
- if (!file_exists($p))
+ $p = VAR_ASYNC . s2p($ref) . $ref . "_data";
+ if (!file_exists($p)) {
return 'Error';
+ }
$crypted = false;
$crypt_key = '';
- if ($crypt == true && extension_loaded('mcrypt') == true)
- {
- $crypt_key = jirafeau_encrypt_file ($p, $p);
- if (strlen($crypt_key) > 0)
+ if ($crypt == true && extension_loaded('mcrypt') == true) {
+ $crypt_key = jirafeau_encrypt_file($p, $p);
+ if (strlen($crypt_key) > 0) {
$crypted = true;
+ }
}
- $md5 = md5_file ($p);
+ $md5 = md5_file($p);
$size = filesize($p);
- $np = s2p ($md5);
- $delete_link_code = jirafeau_gen_random (5);
+ $np = s2p($md5);
+ $delete_link_code = jirafeau_gen_random(5);
/* File already exist ? */
- if (!file_exists (VAR_FILES . $np))
- @mkdir (VAR_FILES . $np, 0755, true);
- if (!file_exists (VAR_FILES . $np . $md5))
- rename ($p, VAR_FILES . $np . $md5);
+ if (!file_exists(VAR_FILES . $np)) {
+ @mkdir(VAR_FILES . $np, 0755, true);
+ }
+ if (!file_exists(VAR_FILES . $np . $md5)) {
+ rename($p, VAR_FILES . $np . $md5);
+ }
/* Increment or create count file. */
$counter = 0;
- if (file_exists (VAR_FILES . $np . $md5 . '_count'))
- {
- $content = file (VAR_FILES . $np . $md5. '_count');
- $counter = trim ($content[0]);
+ if (file_exists(VAR_FILES . $np . $md5 . '_count')) {
+ $content = file(VAR_FILES . $np . $md5. '_count');
+ $counter = trim($content[0]);
}
$counter++;
- $handle = fopen (VAR_FILES . $np . $md5. '_count', 'w');
- fwrite ($handle, $counter);
- fclose ($handle);
+ $handle = fopen(VAR_FILES . $np . $md5. '_count', 'w');
+ fwrite($handle, $counter);
+ fclose($handle);
/* Create link. */
- $link_tmp_name = VAR_LINKS . $md5 . rand (0, 10000) . '.tmp';
- $handle = fopen ($link_tmp_name, 'w');
- fwrite ($handle,
+ $link_tmp_name = VAR_LINKS . $md5 . rand(0, 10000) . '.tmp';
+ $handle = fopen($link_tmp_name, 'w');
+ fwrite($handle,
$a['file_name'] . NL . $a['mime_type'] . NL . $size . NL .
$a['key'] . NL . $a['time'] . NL . $md5 . NL . $a['onetime'] . NL .
- time () . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
- fclose ($handle);
- $md5_link = substr(base_16_to_64 (md5_file ($link_tmp_name)), 0, $link_name_length);
- $l = s2p ("$md5_link");
- if (!@mkdir (VAR_LINKS . $l, 0755, true) ||
- !rename ($link_tmp_name, VAR_LINKS . $l . $md5_link))
+ time() . NL . $a['ip'] . NL . $delete_link_code . NL . ($crypted ? 'C' : 'O'));
+ fclose($handle);
+ $md5_link = substr(base_16_to_64(md5_file($link_tmp_name)), 0, $link_name_length);
+ $l = s2p("$md5_link");
+ if (!@mkdir(VAR_LINKS . $l, 0755, true) ||
+ !rename($link_tmp_name, VAR_LINKS . $l . $md5_link)) {
echo "Error";
+ }
/* Clean async upload. */
- jirafeau_async_delete ($ref);
+ jirafeau_async_delete($ref);
return $md5_link . NL . $delete_link_code . NL . urlencode($crypt_key);
}
-function
-jirafeau_crypt_create_iv($base, $size)
+function jirafeau_crypt_create_iv($base, $size)
{
$iv = '';
- while (strlen ($iv) < $size)
+ while (strlen($iv) < $size) {
$iv = $iv . $base;
+ }
$iv = substr($iv, 0, $size);
return $iv;
}
@@ -988,32 +977,32 @@ jirafeau_crypt_create_iv($base, $size)
* @param $fp_dst file path to the file to write crypted file (could be the same).
* @return decrypt key composed of the key and the iv separated by a point ('.')
*/
-function
-jirafeau_encrypt_file ($fp_src, $fp_dst)
+function jirafeau_encrypt_file($fp_src, $fp_dst)
{
- $fs = filesize ($fp_src);
- if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true))
+ $fs = filesize($fp_src);
+ if ($fs === false || $fs == 0 || !(extension_loaded('mcrypt') == true)) {
return '';
+ }
/* Prepare module. */
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Generate key. */
- $crypt_key = jirafeau_gen_random (10);
+ $crypt_key = jirafeau_gen_random(10);
$md5_key = md5($crypt_key);
- $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+ $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
/* Init module. */
mcrypt_generic_init($m, $md5_key, $iv);
/* Crypt file. */
- $r = fopen ($fp_src, 'r');
- $w = fopen ($fp_dst, 'c');
- while (!feof ($r))
- {
- $enc = mcrypt_generic($m, fread ($r, 1024));
- if (fwrite ($w, $enc) === false)
+ $r = fopen($fp_src, 'r');
+ $w = fopen($fp_dst, 'c');
+ while (!feof($r)) {
+ $enc = mcrypt_generic($m, fread($r, 1024));
+ if (fwrite($w, $enc) === false) {
return '';
+ }
}
- fclose ($r);
- fclose ($w);
+ fclose($r);
+ fclose($w);
/* Cleanup. */
mcrypt_generic_deinit($m);
mcrypt_module_close($m);
@@ -1027,30 +1016,30 @@ jirafeau_encrypt_file ($fp_src, $fp_dst)
* @param $k string composed of the key and the iv separated by a point ('.')
* @return key used to decrypt. a string of length 0 is returned if failed.
*/
-function
-jirafeau_decrypt_file ($fp_src, $fp_dst, $k)
+function jirafeau_decrypt_file($fp_src, $fp_dst, $k)
{
- $fs = filesize ($fp_src);
- if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false)
+ $fs = filesize($fp_src);
+ if ($fs === false || $fs == 0 || extension_loaded('mcrypt') == false) {
return false;
+ }
/* Init module */
$m = mcrypt_module_open('rijndael-256', '', 'ofb', '');
/* Extract key and iv. */
$crypt_key = $k;
$md5_key = md5($crypt_key);
- $iv = jirafeau_crypt_create_iv ($md5_key, mcrypt_enc_get_iv_size($m));
+ $iv = jirafeau_crypt_create_iv($md5_key, mcrypt_enc_get_iv_size($m));
/* Decrypt file. */
- $r = fopen ($fp_src, 'r');
- $w = fopen ($fp_dst, 'c');
- while (!feof ($r))
- {
- $dec = mdecrypt_generic($m, fread ($r, 1024));
- if (fwrite ($w, $dec) === false)
+ $r = fopen($fp_src, 'r');
+ $w = fopen($fp_dst, 'c');
+ while (!feof($r)) {
+ $dec = mdecrypt_generic($m, fread($r, 1024));
+ if (fwrite($w, $dec) === false) {
return false;
+ }
}
- fclose ($r);
- fclose ($w);
+ fclose($r);
+ fclose($w);
/* Cleanup. */
mcrypt_generic_deinit($m);
mcrypt_module_close($m);
@@ -1061,10 +1050,9 @@ jirafeau_decrypt_file ($fp_src, $fp_dst, $k)
* Check if Jirafeau is password protected for visitors.
* @return true if Jirafeau is password protected, false otherwise.
*/
-function
-jirafeau_has_upload_password ($cfg)
+function jirafeau_has_upload_password($cfg)
{
- return count ($cfg['upload_password']) > 0;
+ return count($cfg['upload_password']) > 0;
}
/**
@@ -1072,78 +1060,136 @@ jirafeau_has_upload_password ($cfg)
* @param $password password to be challenged
* @return true if password is valid, false otherwise.
*/
-function
-jirafeau_challenge_upload_password ($cfg, $password)
+function jirafeau_challenge_upload_password($cfg, $password)
{
- if (!jirafeau_has_upload_password($cfg))
+ if (!jirafeau_has_upload_password($cfg)) {
return false;
- forEach ($cfg['upload_password'] as $p)
- if ($password == $p)
+ }
+ foreach ($cfg['upload_password'] as $p) {
+ if ($password == $p) {
return true;
+ }
+ }
return false;
}
/**
* Test if visitor's IP is authorized to upload.
- * @param $ip IP to be challenged
+ *
+ * @param $allowedIpList array of allowed IPs
+ * @param $challengedIp IP to be challenged
* @return true if IP is authorized, false otherwise.
*/
-function
-jirafeau_challenge_upload_ip ($cfg, $ip)
+function jirafeau_challenge_upload_ip($allowedIpList, $challengedIp)
+{
+ // skip if list is empty = all IPs allowed
+ if (count($allowedIpList) == 0) {
+ return true;
+ }
+ // test given IP against each allowed IP
+ foreach ($allowedIpList as $i) {
+ if ($i == $challengedIp) {
+ return true;
+ }
+ // CIDR test for IPv4 only.
+ if (strpos($i, '/') !== false) {
+ list($subnet, $mask) = explode('/', $i);
+ if ((ip2long($challengedIp) & ~((1 << (32 - $mask)) - 1)) == ip2long($subnet)) {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+/**
+ * Test if visitor's IP is authorized or password is supplied and authorized
+ * @param $ip IP to be challenged
+ * @param $password password to be challenged
+ * @return true if access is valid, false otherwise.
+ */
+function jirafeau_challenge_upload ($cfg, $ip, $password)
{
- if (count ($cfg['upload_ip']) == 0)
+ // Allow if no ip restrictaion and no password restriction
+ if ((count ($cfg['upload_ip']) == 0) and (count ($cfg['upload_password']) == 0)) {
return true;
- forEach ($cfg['upload_ip'] as $i)
- {
- if ($i == $ip)
+ }
+
+ // Allow if ip is in array (no password)
+ foreach ($cfg['upload_ip_nopassword'] as $i) {
+ if ($i == $ip) {
+ return true;
+ }
+ // CIDR test for IPv4 only.
+ if (strpos ($i, '/') !== false)
+ {
+ list ($subnet, $mask) = explode('/', $i);
+ if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) {
+ return true;
+ }
+ }
+ }
+
+ // Allow if ip is in array
+ foreach ($cfg['upload_ip'] as $i) {
+ if ($i == $ip) {
return true;
+ }
// CIDR test for IPv4 only.
if (strpos ($i, '/') !== false)
{
list ($subnet, $mask) = explode('/', $i);
- if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet))
+ if ((ip2long ($ip) & ~((1 << (32 - $mask)) - 1) ) == ip2long ($subnet)) {
return true;
+ }
+ }
+ }
+ if (!jirafeau_has_upload_password($cfg)) {
+ return false;
+ }
+
+ foreach ($cfg['upload_password'] as $p) {
+ if ($password == $p) {
+ return true;
}
}
return false;
}
/** Tell if we have some HTTP headers generated by a proxy */
-function
-has_http_forwarded()
+function has_http_forwarded()
{
return
- !empty ($_SERVER['HTTP_X_FORWARDED_FOR']) ||
- !empty ($_SERVER['http_X_forwarded_for']);
+ !empty($_SERVER['HTTP_X_FORWARDED_FOR']) ||
+ !empty($_SERVER['http_X_forwarded_for']);
}
/**
* Generate IP list from HTTP headers generated by a proxy
* @return array of IP strings
*/
-function
-get_ip_list_http_forwarded()
+function get_ip_list_http_forwarded()
{
$ip_list = array();
- if (!empty ($_SERVER['HTTP_X_FORWARDED_FOR']))
- {
- $l = explode (',', $_SERVER['HTTP_X_FORWARDED_FOR']);
- if ($l === FALSE)
+ if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+ $l = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
+ if ($l === false) {
return array();
- foreach ($l as $ip)
- array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
+ }
+ foreach ($l as $ip) {
+ array_push($ip_list, preg_replace('/\s+/', '', $ip));
+ }
}
- if (!empty ($_SERVER['http_X_forwarded_for']))
- {
- $l = explode (',', $_SERVER['http_X_forwarded_for']);
- foreach ($l as $ip)
- {
+ if (!empty($_SERVER['http_X_forwarded_for'])) {
+ $l = explode(',', $_SERVER['http_X_forwarded_for']);
+ foreach ($l as $ip) {
// Separate IP from port
- $ipa = explode (':', $ip);
- if ($ipa === FALSE)
+ $ipa = explode(':', $ip);
+ if ($ipa === false) {
continue;
+ }
$ip = $ipa[0];
- array_push ($ip_list, preg_replace ('/\s+/', '', $ip));
+ array_push($ip_list, preg_replace('/\s+/', '', $ip));
}
}
return $ip_list;
@@ -1154,23 +1200,24 @@ get_ip_list_http_forwarded()
* or from HTTP_X_FORWARDED_FOR if behind a proxy
* @returns the client ip address
*/
-function
-get_ip_address($cfg)
+function get_ip_address($cfg)
{
$remote = $_SERVER['REMOTE_ADDR'];
- if (count ($cfg['proxy_ip']) == 0 || !has_http_forwarded ())
+ if (count($cfg['proxy_ip']) == 0 || !has_http_forwarded()) {
return $remote;
+ }
- $ip_list = get_ip_list_http_forwarded ();
- if (count ($ip_list) == 0)
+ $ip_list = get_ip_list_http_forwarded();
+ if (count($ip_list) == 0) {
return $remote;
+ }
- foreach ($cfg['proxy_ip'] as $proxy_ip)
- {
- if ($remote != $proxy_ip)
+ foreach ($cfg['proxy_ip'] as $proxy_ip) {
+ if ($remote != $proxy_ip) {
continue;
+ }
// Take the last IP (the one which has been set by the defined proxy).
- return end ($ip_list);
+ return end($ip_list);
}
return $remote;
}
@@ -1181,181 +1228,69 @@ get_ip_address($cfg)
function hex_to_base64($hex)
{
$b = '';
- foreach (str_split ($hex, 2) as $pair)
- $b .= chr (hexdec ($pair));
- return base64_encode ($b);
+ foreach (str_split($hex, 2) as $pair) {
+ $b .= chr(hexdec($pair));
+ }
+ return base64_encode($b);
}
/**
- * Read alias informations
- * @return array containing informations.
+ * Replace markers in templates.
+ *
+ * Available markers have the scheme "###MARKERNAME###".
+ *
+ * @param $content string Template text with markers
+ * @param $htmllinebreaks boolean Convert linebreaks to BR-Tags
+ * @return Template with replaced markers
*/
-function
-jirafeau_get_alias ($hash)
+function jirafeau_replace_markers($content, $htmllinebreaks = false)
{
- $out = array ();
- $link = VAR_ALIAS . s2p ("$hash") . $hash;
-
- if (!file_exists ($link))
- return $out;
-
- $c = file ($link);
- $out['md5_password'] = trim ($c[0]);
- $out['ip'] = trim ($c[1]);
- $out['update_date'] = trim ($c[2]);
- $out['destination'] = trim ($c[3], NL);
+ $patterns = array(
+ '/###ORGANISATION###/',
+ '/###CONTACTPERSON###/',
+ '/###WEBROOT###/'
+ );
+ $replacements = array(
+ $GLOBALS['cfg']['organisation'],
+ $GLOBALS['cfg']['contactperson'],
+ $GLOBALS['cfg']['web_root']
+ );
+ $content = preg_replace($patterns, $replacements, $content);
+
+ if (true === $htmllinebreaks) {
+ $content = nl2br($content);
+ }
- return $out;
+ return $content;
}
-/** Create an alias to a jirafeau's link.
- * @param $alias alias name
- * @param $destination reference of the destination
- * @param $password password to protect alias
- * @param $ip client's IP
- * @return a string containing the edit code of the alias or the string "Error"
- */
-function
-jirafeau_alias_create ($alias, $destination, $password, $ip)
+function jirafeau_escape($string)
{
- /* Check that alias and password are long enough. */
- if (strlen ($alias) < 8 ||
- strlen ($alias) > 32 ||
- strlen ($password) < 8 ||
- strlen ($password) > 32)
- return 'Error';
-
- /* Check that destination exists. */
- $l = jirafeau_get_link ($destination);
- if (!count ($l))
- return 'Error';
-
- /* Check that alias does not already exists. */
- $alias = md5 ($alias);
- $p = VAR_ALIAS . s2p ($alias);
- if (file_exists ($p))
- return 'Error';
-
- /* Create alias folder. */
- @mkdir ($p, 0755, true);
- if (!file_exists ($p))
- return 'Error';
-
- /* Generate password. */
- $md5_password = md5 ($password);
-
- /* Store informations. */
- $p .= $alias;
- $handle = fopen ($p, 'w');
- fwrite ($handle,
- $md5_password . NL .
- $ip . NL .
- time () . NL .
- $destination . NL);
- fclose ($handle);
-
- return 'Ok';
+ return htmlspecialchars($string, ENT_QUOTES);
}
-/** Update an alias.
- * @param $alias alias to update
- * @param $destination reference of the new destination
- * @param $password password to protect alias
- * @param $new_password optional new password to protect alias
- * @param $ip client's IP
- * @return "Ok" or "Error" string
- */
-function
-jirafeau_alias_update ($alias, $destination, $password,
- $new_password, $ip)
+function jirafeau_admin_session_start()
{
- $alias = md5 ($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias ($alias);
- if (!count ($a))
- return 'Error';
-
- /* Check that destination exists. */
- $l = jirafeau_get_link ($a["destination"]);
- if (!count ($l))
- return 'Error';
-
- /* Check password. */
- if ($a["md5_password"] != md5 ($password))
- return 'Error';
-
- $p = $a['md5_password'];
- if (strlen ($new_password) >= 8 &&
- strlen ($new_password) <= 32)
- $p = md5 ($new_password);
- else if (strlen ($new_password) > 0)
- return 'Error';
-
- /* Rewrite informations. */
- $p = VAR_ALIAS . s2p ($alias) . $alias;
- $handle = fopen ($p, 'w');
- fwrite ($handle,
- $p . NL .
- $ip . NL .
- time () . NL .
- $destination . NL);
- fclose ($handle);
- return 'Ok';
+ $_SESSION['admin_auth'] = true;
+ $_SESSION['admin_csrf'] = md5(uniqid(mt_rand(), true));
}
-/** Get an alias.
- * @param $alias alias to get
- * @return alias destination or "Error" string
- */
-function
-jirafeau_alias_get ($alias)
+function jirafeau_admin_session_end()
{
- $alias = md5 ($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias ($alias);
- if (!count ($a))
- return 'Error';
-
- return $a['destination'];
+ $_SESSION = array();
+ session_destroy();
}
-function
-jirafeau_clean_rm_alias ($alias)
+function jirafeau_admin_session_logged()
{
- $p = s2p ("$alias");
- if (file_exists (VAR_ALIAS . $p . $alias))
- unlink (VAR_ALIAS . $p . $alias);
- $parse = VAR_ALIAS . $p;
- $scan = array();
- while (file_exists ($parse)
- && ($scan = scandir ($parse))
- && count ($scan) == 2 // '.' and '..' folders => empty.
- && basename ($parse) != basename (VAR_ALIAS))
- {
- rmdir ($parse);
- $parse = substr ($parse, 0, strlen($parse) - strlen(basename ($parse)) - 1);
- }
+ return isset($_SESSION['admin_auth']) &&
+ isset($_SESSION['admin_csrf']) &&
+ isset($_POST['admin_csrf']) &&
+ $_SESSION['admin_auth'] === true &&
+ $_SESSION['admin_csrf'] === $_POST['admin_csrf'];
}
-/** Delete an alias.
- * @param $alias alias to delete
- * @param $password password to protect alias
- * @return "Ok" or "Error" string
- */
-function
-jirafeau_alias_delete ($alias, $password)
+function jirafeau_admin_csrf_field()
{
- $alias = md5 ($alias);
- /* Check that alias exits. */
- $a = jirafeau_get_alias ($alias);
- if (!count ($a))
- return "Error";
-
- /* Check password. */
- if ($a["md5_password"] != md5 ($password))
- return 'Error';
-
- jirafeau_clean_rm_alias ($alias);
- return 'Ok';
+ return "