From 99e888f5d115512cb8c1ecde09a2b6718f74ba86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Fri, 28 Oct 2022 15:32:46 +0200 Subject: [PATCH] log failed --- src/Jirafeau/a.php | 33 ++++++++++++- src/Jirafeau/f.php | 112 +++++++++++++++++++++++---------------------- src/bash/filter.sh | 22 +++++++-- 3 files changed, 106 insertions(+), 61 deletions(-) diff --git a/src/Jirafeau/a.php b/src/Jirafeau/a.php index 879c6d8..736b1fa 100644 --- a/src/Jirafeau/a.php +++ b/src/Jirafeau/a.php @@ -25,6 +25,7 @@ require (JIRAFEAU_ROOT . 'lib/lang.php'); define ('VAR_TOKENS', $cfg ['var_root'].'tokens/'); define ('VAR_TRACKS', $cfg ['var_root'].'tracks/'); +define ('VAR_LANG', $cfg ['var_root'].'lang/'); define ('VAR_PERIOD', $cfg ['var_root'].'period/'); define ('VAR_FAKE', $cfg ['var_root'].'fake/'); define ('VAR_ADMIN', $cfg ['var_root'].'admin/'); @@ -38,6 +39,7 @@ define ('TOKEN_USE_LIMIT', "-2 hours"); define ('TOKEN_LOGIN_LIMIT', "-15 minutes"); define ('TOKEN_LOGOUT_LIMIT', "-8 hours"); define ('DEFAULT_PERIOD', "month"); +define ('DEFAULT_LANG', "fr"); define ('E_BAD_ARCHIVE_NAME', 'Bad archive name format'); define ('E_CREATE_ZIP', "Impossible de créer l'archive."); @@ -72,7 +74,7 @@ define ('M_WELCOME', "

Informations concernant le compte : ___SENDER___ define ('M_INCONSISTENT_DATES', " (dates incohéantes avec ___FILENAME___ : ___DIRTIME___ != ___FILETIME___)"); -define ('A_ACTION', 'a'); // action : T_LOGIN, T_LOGOUT, A_RECORD+(on|off), A_PERIOD(minute|hour|day|week|month|quarter) +define ('A_ACTION', 'a'); // action : T_LOGIN, T_LOGOUT, A_RECORD+(on|off), A_LANG(fr|en|br), A_PERIOD(minute|hour|day|week|month|quarter) define ('A_GET', 'g'); // get archive define ('A_HASH', 'h'); // file to update or delete define ('A_OPEN_TOKEN', 'o'); // ask token @@ -81,6 +83,7 @@ define ('A_TOKEN', 't'); // session token define ('A_UPDATE', 'u'); // update perriod for file or archive define ('A_RECORD', 'r'); // get track status define ('A_PERIOD', 'p'); // get period status +define ('A_LANG', 'l'); // get lang status define ('A_DELETE', 'd'); // delete file ou archive + (sender+token) define ('T_BAD_PASW', 'bad_psw'); define ('T_CREATE', "create"); @@ -107,6 +110,7 @@ define ('T_ARCHIVE_TITLE', "archive_content"); define ('T_ARCHIVE_MIME', "text/kaz_email_archive"); +$langText = ['fr' => "Francais", 'br' => "Breton", 'en' => "english"]; $periodText = ['minute' => "minute", 'hour' => "heure", 'day' => "jour", 'week' => "semaine", 'month' => "mois"]; // XXX , 'quarter' => "trimestre"]; $periodButton = ['hour' => ["🕕", ">1 heure"], @@ -193,6 +197,29 @@ function isSenderTrack ($sender) { return $sender && file_exists (VAR_TRACKS.$sender); } +// ======================================== +function setSenderLang ($sender, $lang) { + if (!$sender) + return; + if (!file_exists (VAR_LANG)) + mkdir (VAR_LANG, 0755); + if (empty ($lang) || DEFAULT_LANG == $lang) { + rmSenderLang ($sender); + } else + file_put_contents (VAR_LANG.$sender, $lang.NL); +} +function rmSenderLang ($sender) { + if (!$sender) + return; + if (file_exists (VAR_LANG.$sender)) + unlink (VAR_LANG.$sender); +} +function getSenderLang ($sender) { + if ($sender && file_exists (VAR_LANG.$sender)) + return trim (file (VAR_LANG.$sender)[0]); + return DEFAULT_LANG; +} + // ======================================== function setSenderPeriod ($sender, $period) { if (!$sender) @@ -934,6 +961,10 @@ if (isset ($_REQUEST [A_ACTION])) { rmSenderTrack ($sender); $message .= "Votre suivi à été mise à jour."; break; + case preg_match ("/^".A_LANG."(".implode ("|", array_keys ($langText)).")$/i", $_REQUEST [A_ACTION], $matches): + setSenderLang ($sender, $matches [1]); + $message .= "Votre lang à été mise à jour."; + break; case preg_match ("/^".A_PERIOD."(".implode ("|", array_keys ($periodText)).")$/i", $_REQUEST [A_ACTION], $matches): setSenderPeriod ($sender, $matches [1]); $message .= "Votre période à été mise à jour."; diff --git a/src/Jirafeau/f.php b/src/Jirafeau/f.php index b6c1c7b..8e9ec5e 100644 --- a/src/Jirafeau/f.php +++ b/src/Jirafeau/f.php @@ -46,7 +46,7 @@ $link = jirafeau_get_link($link_name); if (count($link) == 0) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

' . t('FILE_404') . - '

'; + '

'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -76,7 +76,7 @@ if (!file_exists(VAR_FILES . $p . $link['hash'])) { jirafeau_delete_link($link_name); require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

'.t('FILE_NOT_AVAIL'). - '

'; + '

'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -86,27 +86,28 @@ if (!empty($delete_code) && $delete_code == $link['link_code']) { if (isset($_POST['do_delete'])) { jirafeau_delete_link($link_name); echo '

'.t('FILE_DELETED'). - '

'; + '

'; } else { ?>
-
+ +
+ + + + + +
+ +
+' . t('TOS') . '.' ?> +
+ + onclick="document.getElementById('submit_delete_post').action='" /> +
+
$link['time']) { jirafeau_delete_link($link_name); require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

'. - t('FILE_EXPIRED') . ' ' . - t('FILE_DELETED') . - '

'; + t('FILE_EXPIRED') . ' ' . + t('FILE_DELETED') . + '

'; require(JIRAFEAU_ROOT . 'lib/template/footer.php'); exit; } @@ -125,7 +126,7 @@ if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) { if (empty($crypt_key) && $link['crypted']) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

' . t('FILE_404') . - '

'; + '

'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -139,16 +140,16 @@ if (!empty($link['key'])) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '
' . '
'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; @@ -181,7 +182,7 @@ if (!empty($link['key'])) { sleep(2); require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '

' . t('ACCESS_KO') . - '

'; + '

'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); exit; } @@ -191,38 +192,38 @@ if (!empty($link['key'])) { if (!$password_challenged && !$do_download && !$do_preview) { require(JIRAFEAU_ROOT.'lib/template/header.php'); echo '
' . - '
'; ?> - ' . jirafeau_escape($link['file_name']) . '' . - '' . - ''; + ''; ?> + ' . jirafeau_escape($link['file_name']) . '
' . - t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' . - '
' . - t('USING_SERVICE'). ' ' . t('TOS') . '.' . - '
' . + '' . + ''; if ($link['onetime'] == 'O') { echo ''; + t('AUTO_DESTRUCT') . + ''; } ?> - '; echo '
' . + t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' . + '
' . + t('USING_SERVICE'). ' ' . t('TOS') . '.' . + '
' . - t('AUTO_DESTRUCT') . - '
'; require(JIRAFEAU_ROOT.'lib/template/footer.php'); @@ -288,3 +289,4 @@ if ($link['onetime'] == 'O') { exit; ?> + diff --git a/src/bash/filter.sh b/src/bash/filter.sh index 10de3aa..60936a8 100644 --- a/src/bash/filter.sh +++ b/src/bash/filter.sh @@ -48,7 +48,8 @@ EX_TEMPFAIL=75 EX_UNAVAILABLE=69 EX_TOO_LARGE=552 INSPECT_DIR=/var/spool/filter -FIC_LOG=/var/log/mail/filter.log +DIR_LOG=/var/log/mail +FIC_LOG=${DIR_LOG}/filter.log SENDMAIL="/usr/sbin/sendmail -G -i" MAILS=/tmp/FILTER MAX_KEEP_IN_MAIL=5ki @@ -60,10 +61,12 @@ JIRAFEAU_LOCAL=http://depot JIRAFEAU_TIME=month MD5_CMD=/usr/bin/md5sum DISCLAMER_CMD=altermime -MAX_FINAL_SIZE=204800 # 200ki +MAX_FINAL_SIZE=307200 # 300ki ARCHIVE_TITLE="archive_content" ARCHIVE_MIME="text/kaz_email_archive" +KEEP_FAILED=true + #################### FONCTIONS ############################################ BOLD='' RED='' @@ -75,8 +78,9 @@ CYAN='' NC='' # No Color NL=' ' + #--------------------- Fichier de LOG ------------------- -LOG_FIC() { +LOG_FIC () { echo "${BLUE}$(date +%d-%m-%Y-%H-%M-%S)${NC} : $*" >> "${FIC_LOG}" } @@ -85,6 +89,12 @@ quitFilter () { exit $1 } +keepFailed () { + [ -z "${KEEP_FAILED}" ] && return + mkdir -p "${DIR_LOG}/pb/" + cp "$1" "${DIR_LOG}/pb/" +} + #################### MAIN ################################################# echo "${NL}" >> "${FIC_LOG}" LOG_FIC "${GREEN}######################################## filter start${NC}" @@ -186,7 +196,7 @@ LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${IN "" | no | *Error* | \<* ) LOG_FIC " - ${RED}Can't upload <${ATTACH_NAME}> <${ATTACH_CONTENT_TYPE}> <$(wc -c < "${ATTACH_MEDIA}")> (${JIR_TOKEN}) . It will be not change in e-mail.${NC}" echo "new:" - cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak" + keepFailed "${INSPECT_DIR}/in.$$" echo "UPLOAD_FAIL" >> "${JIRAFEAU_ERROR}" ;; * ) @@ -216,7 +226,7 @@ LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${IN "" | no | *Error* | \<* ) LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}) , substitution couldn't be done${NC}" echo "arch: bad" - cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak" + keepFailed "${INSPECT_DIR}/in.$$" echo "ARCHIVE_FAIL" >> "${JIRAFEAU_ERROR}" ;; * ) @@ -247,6 +257,7 @@ if [ "$(wc -l < "${ARCHIVE_CONTENT}")" -ge 3 ]; then actualSize=$(wc -c < "${INSPECT_DIR}/in.$$.altered") if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then LOG_FIC " - ${RED}too big even after diet ${INSPECT_DIR}/in.$$.altered (${actualSize})${NC}" + keepFailed "${INSPECT_DIR}/in.$$" quitFilter "${EX_TOO_LARGE}" fi LOG_FIC " - ${GREEN}send with : ${SENDMAIL} $@ ${INSPECT_DIR}/in.$$.altered ${NC}" @@ -256,6 +267,7 @@ else actualSize=$(wc -c < "${INSPECT_DIR}/in.$$") if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then LOG_FIC " - ${RED}too big without diet ${INSPECT_DIR}/in.$$ (${actualSize}) ${NC}" + keepFailed "${INSPECT_DIR}/in.$$" quitFilter "${EX_TOO_LARGE}" fi LOG_FIC " - ${GREEN}send without attach file${NC}"