fix boundary

Makefile

@@ -58,12 +58,12 @@ JIR_OUT = $(patsubst %, $(OUT_DIR)/%, $(JIR_PRG))
 
 ## FLAGS ###############################
 
-DFLAGS = -O2 -DDISABLE_LOG
+#DFLAGS = -O2 -DDISABLE_LOG
-#DFLAGS = -g -Wall
+DFLAGS = -g -Wall
 
 IFLAGS = $(DFLAGS) -MMD -I$(HPP_DIR) -std=c++11
 
-LFLAGS = -L$(LIB_DIR) -Bstatic -lstdc++ -lcurl -lcrypto -lboost_system -lboost_program_options -lboost_filesystem
+LFLAGS = -L$(LIB_DIR) -lboost_system -lboost_program_options -lboost_filesystem -lcurl -lcrypto -lstdc++
 CC = g++
 
 ## RULES ###############################

README.md

@@ -41,3 +41,14 @@ git clone https://git.kaz.bzh/KAZ/depollueur.git
 
 make -j $(nproc)
 ```
+
+##Astuces
+
+
+Pour la mise au point dans Kaz, il faut bloquer la mise à jour automatique avec :
+
+``` bash
+touch /kaz/git/depollueur/dontupdage
+/kaz/bin/container.sh stop jirafeau postfix; docker system prune; /kaz/bin/install.sh jirafeau postfix
+```
+

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 '<div class="error"><p>' . t('FILE_404') .
-    '</p></div>';
+                                  '</p></div>';
     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 '<div class="error"><p>'.t('FILE_NOT_AVAIL').
-    '</p></div>';
+                                 '</p></div>';
     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 '<div class="message"><p>'.t('FILE_DELETED').
-            '</p></div>';
+                                       '</p></div>';
     } else { ?>
         <div>
-        <form action="f.php" method="post" id="submit_delete_post" class="form login">
+            <form action="f.php" method="post" id="submit_delete_post" class="form login">
-        <input type="hidden" name="do_delete" value=1/>
+            <input type="hidden" name="do_delete" value=1/>
-        <fieldset>
+            <fieldset>
-             <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
+            <legend> <?php echo t('CONFIRM_DEL') ?> </legend>
-             <table>
+            <table>
-             <tr><td>
+            <tr><td>
-             <?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
+<?php echo t('GONNA_DEL') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' ?>
-             </td></tr>
+            </td></tr>
-             <tr><td>
+                  <tr><td>
-                <?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
+<?php echo t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' ?>
-             </td></tr>
+                  </td></tr>
-             <tr><td>
+                        <tr><td>
-                <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>" <?php $action_delete="'f.php?h=' . $link_name . '&amp;d=' . $delete_code'; document.getElementById('submit_delete').submit ();"; ?>
+                        <input type="submit" id="submit_delete"  value="<?php echo t('DELETE'); ?>"
-                onclick="document.getElementById('submit_delete_post').action='<?php echo $action_delete; ?>"/>
+                        <?php $action_delete="'f.php?h=' . $link_name . '&amp;d=' . $delete_code'; document.getElementById('submit_delete').submit ();"; ?>
-             </td></tr>
+                        onclick="document.getElementById('submit_delete_post').action='<?php echo $action_delete; ?>" />
-             </table>
+                               </td></tr>
-         </fieldset></form></div><?php
+                               </table>
-    }
+                               </fieldset></form></div><?php
+                               }
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
@@ -115,9 +116,9 @@ if ($link['time'] != JIRAFEAU_INFINITY && time() > $link['time']) {
     jirafeau_delete_link($link_name);
     require(JIRAFEAU_ROOT.'lib/template/header.php');
     echo '<div class="error"><p>'.
-    t('FILE_EXPIRED') . ' ' .
+                                 t('FILE_EXPIRED') . ' ' .
-    t('FILE_DELETED') .
+                                 t('FILE_DELETED') .
-    '</p></div>';
+                                 '</p></div>';
     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 '<div class="error"><p>' . t('FILE_404') .
-    '</p></div>';
+                                  '</p></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
     exit;
 }
@@ -139,16 +140,16 @@ if (!empty($link['key'])) {
             require(JIRAFEAU_ROOT.'lib/template/header.php');
             echo '<div>' .
                          '<form action="f.php" method="post" id="submit_post" class="form login">'; ?>
-            <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
+                         <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
-            echo '<fieldset>' .
+                                     echo '<fieldset>' .
-                              '<legend>' . t('PSW_PROTEC') .
+                                     '<legend>' . t('PSW_PROTEC') .
-                              '</legend><table><tr><td>' .
+                                     '</legend><table><tr><td>' .
-                              t('GIMME_PSW') . ' : ' .
+                                     t('GIMME_PSW') . ' : ' .
-                              '<input type = "password" name = "key" />' .
+                                     '<input type = "password" name = "key" />' .
-                              '</td></tr>' .
+                                     '</td></tr>' .
-                              '<tr><td>' .
+                                     '<tr><td>' .
-                              t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
+                                     t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
-                              '</td></tr>';
+                                     '</td></tr>';
 
             if ($link['onetime'] == 'O') {
                 echo '<tr><td id="self_destruct">' .
@@ -163,13 +164,13 @@ if (!empty($link['key'])) {
         document.getElementById('submit_download').submit ();"/><?php
                                              if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
                                                  ?><input type="submit" id = "submit_preview"  value="<?php echo t('PREVIEW'); ?>"
-                                                 onclick="document.getElementById('submit_post').action='<?php
+                                                     onclick="document.getElementById('submit_post').action='<?php
             echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
             document.getElementById('submit_preview').submit ();"/><?php
-                                             }
+                                                     }
             echo '</td></tr></table></fieldset></form></div>';
             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 '<div class="error"><p>' . t('ACCESS_KO') .
-            '</p></div>';
+                                          '</p></div>';
             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 '<div>' .
-             '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
+                 '<form action="f.php" method="post" id="submit_post" class="form download">'; ?>
-             <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
+                 <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
-        echo '<fieldset><legend>' . jirafeau_escape($link['file_name']) . '</legend><table>' .
+                             echo '<fieldset><legend>' . jirafeau_escape($link['file_name']) . '</legend><table>' .
-             '<tr><td>' .
+                             '<tr><td>' .
-             t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
+                             t('NOW_DOWNLOADING') . ' "' . jirafeau_escape($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
-             '</td></tr>' .
+                             '</td></tr>' .
-             '<tr><td>' .
+                             '<tr><td>' .
-             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
+                             t('USING_SERVICE'). ' <a href="tos.php" target="_blank" rel="noopener noreferrer">' . t('TOS') . '</a>.' .
-             '</td></tr>';
+                             '</td></tr>';
 
     if ($link['onetime'] == 'O') {
         echo '<tr><td id="self_destruct">' .
-                 t('AUTO_DESTRUCT') .
+                                           t('AUTO_DESTRUCT') .
-                 '</td></tr>';
+                                           '</td></tr>';
     } ?>
-        <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('DL'); ?>"
+                                     <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('DL'); ?>"
-        onclick="document.getElementById('submit_post').action='<?php
+                                     onclick="document.getElementById('submit_post').action='<?php
         echo 'f.php?h=' . $link_name . '&amp;d=1';
     if (!empty($crypt_key)) {
         echo '&amp;k=' . urlencode($crypt_key);
     } ?>';
         document.getElementById('submit_post').submit ();"/><?php
 
-        if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
+                                     if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type'])) {
-            ?><input type="submit" id = "submit_preview"  value="<?php echo t('PREVIEW'); ?>"
+                                         ?><input type="submit" id = "submit_preview"  value="<?php echo t('PREVIEW'); ?>"
-            onclick="document.getElementById('submit_post').action='<?php
+                                             onclick="document.getElementById('submit_post').action='<?php
         echo 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key)) {
                 echo '&amp;k=' . urlencode($crypt_key);
             } ?>';
         document.getElementById('submit_post').submit ();"/><?php
-        }
+                                             }
     echo '</td></tr>';
     echo '</table></fieldset></form></div>';
     require(JIRAFEAU_ROOT.'lib/template/footer.php');
@@ -288,3 +289,4 @@ if ($link['onetime'] == 'O') {
 exit;
 
 ?>
+

src/bash/filter.sh

@@ -48,11 +48,12 @@ 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=24ki
+MAX_KEEP_IN_MAIL=5ki
-MAX_UPLOAD_SIZE=100Mi
+MAX_UPLOAD_SIZE=1Gi
 SHRINK_CMD=/home/filter/eMailShrinker
 JIRAFEAU_CMD=/home/filter/jirafeauAPI
 JIRAFEAU_URL=https://depot.${DOMAINNAME:-"kaz.bzh"}
@@ -60,23 +61,69 @@ 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
+DEBUG=
 
 ####################  FONCTIONS ############################################
+BOLD=''
+RED=''
+GREEN=''
+YELLOW=''
+BLUE=''
+MAGENTA=''
+CYAN=''
+NC='' # No Color
+NL='
+'
+
 #--------------------- Fichier de LOG -------------------
-LOG_FIC() {
+LOG_FIC () {
-    echo "$(date +%d-%m-%Y-%H-%M-%S) : $*" >> "${FIC_LOG}"
+    echo "${BLUE}$(date +%d-%m-%Y-%H-%M-%S)${NC} : $*" >> "${FIC_LOG}"
+}
+
+quitFilter () {
+    LOG_FIC "${GREEN}######################################## filter stop${NC}"
+    exit $1
+}
+
+keepFailed () {
+    [ -z "${KEEP_FAILED}"  ] && return
+    mkdir -p "${DIR_LOG}/pb/"
+    cp "$1" "${DIR_LOG}/pb/"
 }
 
 ####################  MAIN #################################################
-LOG_FIC "------------------------------------------------------"
+echo "${NL}" >> "${FIC_LOG}"
-LOG_FIC "--------------- debut de programme -------------------"
+LOG_FIC "${GREEN}######################################## filter start${NC}"
 
-mkdir -p "${MAILS}" || { LOG_FIC "impossible de creer ce dossier"; exit "${EX_UNAVAILABLE}"; }
+if ! mkdir -p "${MAILS}"; then
+    LOG_FIC "${RED}Can't mkdir ${MAILS} ${NC}"
+    quitFilter "${EX_UNAVAILABLE}"
+fi
 MAIL_SOURCE=$(echo $@ | awk 'BEGIN{FS=" "} {print $2}')
 DATE_TEMPS=$(date "+%Y-%m-%d-%H:%M:%S")
-REP_PIECE_JOINTE=$(echo "${MAILS}/${DATE_TEMPS}_${MAIL_SOURCE}_$$")
+REP_PIECE_JOINTE="${MAILS}/${DATE_TEMPS}_${MAIL_SOURCE}_$$"
-cd "${INSPECT_DIR}" || { echo "${INSPECT_DIR} does not exist"; exit "${EX_TEMPFAIL}"; }
+TRACK=$(curl "${JIRAFEAU_LOCAL}/a.php?r=${MAIL_SOURCE}" 2>/dev/null)
+PERIOD=$(curl "${JIRAFEAU_LOCAL}/a.php?p=${MAIL_SOURCE}" 2>/dev/null)
+if [ -n "$(echo "${PERIOD}" | grep -e minute -e hour -e day -e week -e month -e quarter 2>/dev/null)" ]; then
+    JIRAFEAU_TIME="${PERIOD}"
+fi
+
+LOG_FIC "\n" \
+	"    MAIL_SOURCE  : ${YELLOW}${MAIL_SOURCE}${NC}\n" \
+	"    DATE_TEMPS   : ${YELLOW}${DATE_TEMPS=}${NC}\n" \
+	"    TRACK        : ${YELLOW}${TRACK}${NC}\n" \
+	"    PERIOD       : ${YELLOW}${PERIOD}${NC}\n" \
+	"    JIRAFEAU_TIME: ${YELLOW}${JIRAFEAU_TIME}${NC}"
+
+if ! cd "${INSPECT_DIR}"; then
+    echo "${INSPECT_DIR} does not exist"
+    quitFilter "${EX_TEMPFAIL}"
+fi
 
 # lien renvoyé par le téléverssement
 ONE_LINK="${REP_PIECE_JOINTE}/one.txt"
@@ -84,129 +131,145 @@ ONE_LINK="${REP_PIECE_JOINTE}/one.txt"
 OLD_LINKS="${REP_PIECE_JOINTE}/url-to-refresh.txt"
 # contenu de l'archive
 ARCHIVE_CONTENT="${REP_PIECE_JOINTE}/archive-content.txt"
+# create if error
+JIRAFEAU_ERROR="${REP_PIECE_JOINTE}/jirafeau-error.txt"
 
 # Clean up when done or when aborting.
-trap "rm -rf in.$$ in.$$.altered ${REP_PIECE_JOINTE}" 0 1 2 3 15
+[ -z "${DEBUG}" ] && trap "rm -rf in.$$ in.$$.altered ${REP_PIECE_JOINTE}" 0 1 2 3 15
 
-cat > "in.$$" || { LOG_FIC "Cannot save mail to file"; exit "${EX_TEMPFAIL}"; }
+if ! cat > "in.$$"; then
-# XXX trace
+    LOG_FIC "${RED}Cannot save mail to file${NC}"
-# cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.bak"
+    quitFilter "${EX_TEMPFAIL}"
+fi
+LOG_FIC "\n" \
+	"             size: ${YELLOW}$(wc -c < "${INSPECT_DIR}/in.$$")${NC}"
+[ -n "${DEBUG}" ] && (mkdir -p "${DIR_LOG}/pb/" ; cp "${INSPECT_DIR}/in.$$" "${DIR_LOG}/pb/in.$$.orig")
 
 mkdir -p "${REP_PIECE_JOINTE}/"
 >"${OLD_LINKS}"
 >"${ARCHIVE_CONTENT}"
 
 # Etape de rafraichissement des anciens fichiers inclus
-cat > "${ARCHIVE_CONTENT}" <<EOF
+echo "time: ${DATE_TEMPS}\nid: $(date +%s)" > "${ARCHIVE_CONTENT}"
-src: ${MAIL_SOURCE}
+[ -n "${TRACK}" ] && echo "sender: ${MAIL_SOURCE}" >> "${ARCHIVE_CONTENT}"
-time: ${DATE_TEMPS}
+
-EOF
+LOG_FIC "${CYAN}${SHRINK_CMD} -u \"${INSPECT_DIR}/in.$$\" 2>> \"${FIC_LOG}\" > \"${OLD_LINKS}\"${NC}"
-LOG_FIC "${SHRINK_CMD} -u \"${INSPECT_DIR}/in.$$\" 2>> \"${FIC_LOG}\" > \"${OLD_LINKS}\""
 "${SHRINK_CMD}" -u "${INSPECT_DIR}/in.$$" 2>> "${FIC_LOG}" > "${OLD_LINKS}"
 
-cat "${OLD_LINKS}" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK
+cat "${OLD_LINKS}" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK; do
-do
     REMOTE_REF=$(echo "${REMOTE_LINK}" | sed -e 's/.*h=\([^&]*\).*/\1/' -e 's/.*http.*//')
     [ -z "${REMOTE_REF}" ] && continue
     REMOTE_KEY=$(echo "${REMOTE_LINK}" | grep "k=" | sed 's%.*k=\([^&]*\).*%\1%')
     # update periode for download
-    LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" update \"${REMOTE_REF}\" 2>&1 >> \"${FIC_LOG}\""
+    LOG_FIC " - ${CYAN}\"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" update \"${REMOTE_REF}\" 2>&1 >> \"${FIC_LOG}\"${NC}"
     "${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t "${JIRAFEAU_TIME}" update "${REMOTE_REF}" 2>&1 >> "${FIC_LOG}"
     echo "old: ${REMOTE_REF} ${REMOTE_KEY}" >> "${ARCHIVE_CONTENT}"
 done
-LOG_FIC " - archive starts with: $(cat ${ARCHIVE_CONTENT})"
+LOG_FIC " - archive starts with: ${NL}${YELLOW}$(cat ${ARCHIVE_CONTENT})${NC}"
 
 # Etape extraction des pieces jointes
-LOG_FIC "${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_DIR}/in.$$"
+LOG_FIC "${CYAN}${SHRINK_CMD} -s ${MAX_KEEP_IN_MAIL} -d ${REP_PIECE_JOINTE} ${INSPECT_DIR}/in.$$ ${NC}"
 "${SHRINK_CMD}" -s "${MAX_KEEP_IN_MAIL}" -d "${REP_PIECE_JOINTE}" "${INSPECT_DIR}/in.$$"  2>> "${FIC_LOG}" | {
-    while read ATTACH_TMP_NAME
+    while read ATTACH_TMP_NAME; do
-    do
+	if [ -d "${ATTACH_TMP_NAME}" ]; then
-	if [ -d "${ATTACH_TMP_NAME}" ]
-	then
 	    ATTACH_MEDIA="${ATTACH_TMP_NAME}/media"
 	    ATTACH_NAME=$(grep "^Name: " "${ATTACH_TMP_NAME}/meta" | cut -c 7- )
 	    ATTACH_CONTENT_TYPE=$(grep "^Content-Type: " "${ATTACH_TMP_NAME}/meta" | cut -c 15- )
 	else
+	    LOG_FIC " - ${RED}no ATTACH_TMP_NAME (${ATTACH_TMP_NAME}) ${NC}"
 	    # XXX error
 	    continue
 	fi
 	# Etape de televersement des pieces jointes
 	PASSWORD=$(apg -n 1 -m 12)
 	PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \  -f 1)
-	LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ATTACH_CONTENT_TYPE}\" -n \"${ATTACH_NAME}\" send \"${ATTACH_MEDIA}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
+	LOG_FIC " - ${CYAN}\"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ATTACH_CONTENT_TYPE}\" -n \"${ATTACH_NAME}\" send \"${ATTACH_MEDIA}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\"${NC}"
-	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -s "${MAX_UPLOAD_SIZE}" -c "${ATTACH_CONTENT_TYPE}" -n "${ATTACH_NAME}" send "${ATTACH_MEDIA}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t "${JIRAFEAU_TIME}" -s "${MAX_UPLOAD_SIZE}" -c "${ATTACH_CONTENT_TYPE}" -n "${ATTACH_NAME}" send "${ATTACH_MEDIA}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
 	cat "${ONE_LINK}"  | {
 	    read JIR_TOKEN
 	    read JIR_CODE
-	    LOG_FIC " - Jirafeau retourne ${JIR_TOKEN} et ${JIR_CODE}"
+	    LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}"
 	    case "${JIR_TOKEN}" in
-		    "" | no | *Error* | \<* )
+		"" | no | *Error* | \<* )
-		    LOG_FIC " - impossible de televerser ${ATTACH_TMP_FILE} (${JIR_TOKEN}), il ne sera pas remplace dans le message"
+		    LOG_FIC " - ${RED}Can't upload <${ATTACH_NAME}> <${ATTACH_CONTENT_TYPE}> <$(wc -c < "${ATTACH_MEDIA}")> (${JIR_TOKEN}) <in.$$.bak>. It will be not change in e-mail.${NC}"
-		    echo "new:"
+		    echo "url:"
+		    keepFailed "${INSPECT_DIR}/in.$$"
+		    echo "UPLOAD_FAIL" >> "${JIRAFEAU_ERROR}"
 		    ;;
 		* )
-		    LOG_FIC " - substitution par ${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}"
+		    LOG_FIC " - change by link ${YELLOW}${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}${NC}"
 		    echo "url: ${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}"
 		    echo "new: ${JIR_TOKEN} ${PASSWORD_MD5}" >> "${ARCHIVE_CONTENT}"
 		    ;;
 	    esac
 	}
-	LOG_FIC " - supprimer l'extraction ${ATTACH_TMP_FILE}"
-	rm -f "${ATTACH_TMP_FILE}"
     done
     # Création de l'archive
-    if [ "$(wc -l < "${ARCHIVE_CONTENT}")" -ge 4 ]; then
+    NB_ATTACH=$(grep -e "^old: " -e "^new: " "${ARCHIVE_CONTENT}" | wc -l)
+    if [ \( -n "${TRACK}" -a "${NB_ATTACH}" -gt 0 \) -o "${NB_ATTACH}" -gt 1 ]; then
 	PASSWORD=$(apg -n 1 -m 12)
 	PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \  -f 1)
-	LOG_FIC " - \"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"text/plain\" -n \"archive_content\" send \"${ARCHIVE_CONTENT}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\""
+	LOG_FIC " - ${MAGENTA}upload archive${NC}"
-	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -s "${MAX_UPLOAD_SIZE}" -c "text/plain" -n "archive_content" send "${ARCHIVE_CONTENT}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+	LOG_FIC " - ${CYAN}\"${JIRAFEAU_CMD}\" -f \"${JIRAFEAU_LOCAL}\" -t \"${JIRAFEAU_TIME}\" -s \"${MAX_UPLOAD_SIZE}\" -c \"${ARCHIVE_MIME}\" -n \"${ARCHIVE_TITLE}\" send \"${ARCHIVE_CONTENT}\" \"${PASSWORD}\" 2>> \"${FIC_LOG}\" > \"${ONE_LINK}\"${NC}"
+	"${JIRAFEAU_CMD}" -f "${JIRAFEAU_LOCAL}" -t "${JIRAFEAU_TIME}" -s "${MAX_UPLOAD_SIZE}" -c "${ARCHIVE_MIME}" -n "${ARCHIVE_TITLE}" send "${ARCHIVE_CONTENT}" "${PASSWORD}" 2>> "${FIC_LOG}" > "${ONE_LINK}"
+    fi
+    LOG_FIC " - final archive content: ${NL}${YELLOW}$(cat ${ARCHIVE_CONTENT})${NC}"
+    if  [ "${NB_ATTACH}" -gt 1 ]; then
 	cat "${ONE_LINK}"  | {
 	    read JIR_TOKEN
 	    read JIR_CODE
-	    LOG_FIC " - Jirafeau retourne ${JIR_TOKEN} et ${JIR_CODE}"
+	    LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}"
 	    case "${JIR_TOKEN}" in
 		"" | no | *Error* | \<* )
-		    LOG_FIC " - impossible de televerser l'archive (${JIR_TOKEN}), il ne sera pas remplace dans le message"
+		    LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}) <in.$$.bak>, substitution couldn't be done${NC}"
 		    echo "arch: bad"
+		    keepFailed "${INSPECT_DIR}/in.$$"
+		    echo "ARCHIVE_FAIL" >> "${JIRAFEAU_ERROR}"
 		    ;;
 		* )
-		    LOG_FIC " - ajoute de l'archive ${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}"
+		    LOG_FIC " - add archive ${YELLOW}${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}${NC}"
 		    echo "arch: ${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}"
 		    ;;
 	    esac
 	}
     else
-	LOG_FIC " - pas d'archive (moins de 2 PJ)"
+	LOG_FIC " - no archive (less than 2 attach file)"
 	echo "arch: none"
     fi
     # Etape de substitution
-    LOG_FIC "${SHRINK_CMD} -s \"${MAX_KEEP_IN_MAIL}\" \"${INSPECT_DIR}/in.$$\" \"${INSPECT_DIR}/in.$$.altered\" 2>> \"${FIC_LOG}\""
+    LOG_FIC "${CYAN}${SHRINK_CMD} -s \"${MAX_KEEP_IN_MAIL}\" \"${INSPECT_DIR}/in.$$\" \"${INSPECT_DIR}/in.$$.altered\" 2>> \"${FIC_LOG}\"${NC}"
 } | "${SHRINK_CMD}" -s "${MAX_KEEP_IN_MAIL}" "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.altered" 2>> "${FIC_LOG}"
 
-# XXX trace
+[ -n "${DEBUG}" ] && (mkdir -p "${DIR_LOG}/pb/" ; cp "${INSPECT_DIR}/in.$$.altered" "${DIR_LOG}/pb/in.$$.altered")
-# cp "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.altered" /var/mail/tmp/
+
+if [ -s "${JIRAFEAU_ERROR}" ]; then
+    LOG_FIC " - ${RED}upload fail${NC}"
+    quitFilter "${EX_TEMPFAIL}"
+fi
 
 # Etape choix de modification du message d'origine
 if [ "$(wc -l < "${ARCHIVE_CONTENT}")" -ge 3 ]; then
     # verification de taille finale
     actualSize=$(wc -c < "${INSPECT_DIR}/in.$$.altered")
     if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then
-	LOG_FIC " - message trop gros apres regime ${INSPECT_DIR}/in.$$.altered (${actualSize})"
+	LOG_FIC " - ${RED}too big even after diet ${INSPECT_DIR}/in.$$.altered (${actualSize})${NC}"
-	exit "${EX_TOO_LARGE}";
+	keepFailed "${INSPECT_DIR}/in.$$"
+	quitFilter "${EX_TOO_LARGE}"
     fi
-    LOG_FIC " - envoi de la commande : ${SENDMAIL} $@ ${INSPECT_DIR}/in.$$.altered"
+    LOG_FIC " - ${GREEN}send with : ${SENDMAIL} $@ ${INSPECT_DIR}/in.$$.altered ${NC}"
     ${SENDMAIL} "$@" < "${INSPECT_DIR}/in.$$.altered"
 else
     # verification de taille finale
     actualSize=$(wc -c < "${INSPECT_DIR}/in.$$")
     if [ ${actualSize} -ge $MAX_FINAL_SIZE ]; then
-	LOG_FIC " - message trop gros sans regime ${INSPECT_DIR}/in.$$ (${actualSize})"
+	LOG_FIC " - ${RED}too big without diet ${INSPECT_DIR}/in.$$ (${actualSize}) ${NC}"
-	exit "${EX_TOO_LARGE}";
+	keepFailed "${INSPECT_DIR}/in.$$"
+	quitFilter "${EX_TOO_LARGE}"
     fi
-    LOG_FIC " - pas de piece jointe"
+    LOG_FIC " - ${GREEN}send without attach file${NC}"
     ${SENDMAIL} "$@" < "in.$$"
 fi
 
-exit 0
+quitFilter 0
 
 ##########################################################################

src/cpp/Attachment.cpp

@@ -65,7 +65,14 @@ const string Attachment::ALTERNATIVE			("alternative");
 
 const regex Attachment::nameCharsetRegEx		(".*name\\*=(.*)");
 const regex Attachment::nameRegEx			(".*name=\"([^\"]*)\".*");
-const regex Attachment::boundaryRegEx			(".*boundary=\"?([^\" ]*)\"?.*");
+// boundary="----=_Part_796779_1154936629.1668080348646"
+// boundary="------------040709000505010508040808"
+// boundary="----------=_1668606031-941125-91"
+// boundary="_004_PAVPR10MB6792713B313048E3A259B215B2079PAVPR10MB6792EURP_";
+// boundary="_000_PAVPR10MB6792713B313048E3A259B215B2079PAVPR10MB6792EURP_"
+// boundary=--boundary_1351_64006126-2b0e-4a3b-98ac-4797d1634188
+// boundary=--boundary_1352_7e294c9a-cfab-44a0-bfb3-7310380ac7cb;
+const regex Attachment::boundaryRegEx			(".*boundary=\"?([^\"; ]*)\"?;?.*");
 const regex Attachment::cidDefRegEx			(".*<([^>]*)>.*");
 const regex Attachment::textRegEx			(".*text/("+PLAIN+"|"+HTML+").*");
 const regex Attachment::multiRegEx			("\\s*multipart/(mixed|"+RELATED+"|"+ALTERNATIVE+").*");
@@ -354,7 +361,11 @@ Attachment::nextBondary (ifstream &mbox, streamoff &curPos) {
 	   ++it)
 	if (couple.find (*it) != string::npos) {
 	  LOG ("find: "+ *it);
-	  subAttachements.back ().toUpdate = true;
+	  LOG ("size: " << subAttachements.size ());
+	  if (subAttachements.size ())
+	    subAttachements.back ().toUpdate = true;
+	  else
+	    LOG_BUG (true, continue, "eMailShrinker: bug A10: boundary format ? " << *this);
 	}
       prev = clearLine;
       continue;
@@ -489,7 +500,7 @@ kaz::operator << (ostream& os, const Attachment& attachment) {
   if (prop.length ())
     prop = " ["+prop+"]";
   
-  os << setw ((attachment.level % 20)*2) << "" << setw (10) << SizeArg (attachment.getSize ()) << "          " << attachment.getContentType ()
+  os << ("****************************************"+40-(attachment.level % 20)*2) << setw (10) << SizeArg (attachment.getSize ()) << "          " << attachment.getContentType ()
      << prop << (attachment.cid.length () ? " id: "+attachment.cid : "")
      << (attachment.boundary.length () ? " boundary: "+attachment.boundary : "")
      << " (" << attachment.beginPos << " / " << attachment.contentPos << " / " << attachment.endPos << ") " << endl;

src/cpp/MainAttachment.cpp

@@ -32,14 +32,15 @@
 // knowledge of the CeCILL-B license and that you accept its terms.	  //
 ////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
+#include <algorithm>
-#include <vector>
-#include <set>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 #include <math.h>
-#include <algorithm>
+#include <regex>
+#include <set>
 #include <unistd.h>
+#include <vector>
 
 #include "kazDebug.hpp"
 #include "kazMisc.hpp"
@@ -50,64 +51,75 @@
 using namespace std;
 using namespace kaz;
 
-static const string KAZ_WEB_SITE		= "https://kaz.bzh/";
+static const string KAZ_WEB_SITE		("https://kaz.bzh/");
-static const string TMPL_DOWNLOAD		= "{{DOWNLOAD}}";
+static const string TMPL_DOWNLOAD		("{{DOWNLOAD}}");
-static const string TMPL_FILENAME		= "{{FILENAME}}";
+static const string TMPL_FILENAME		("{{FILENAME}}");
-static const string CID				= "cid:";
+static const string CID				("cid:");
 
-static const string KAZ_PLAIN_HR		= "______________________________________________________________________________";
+// "l=/" => v1 compatibility
-static const string KAZ_PLAIN_START		= "~~ PJ-KAZ !"; // don't end whith space
+static const regex archiveURLSignature		(".*(([&?]g=)|([&?]l=/)).*");
-static const string KAZ_PLAIN_STOP		= KAZ_PLAIN_START+" ~~";
-static const string KAZ_PLAIN_DONT_TOUCH	= "(conservez cette partie intacte dans votre réponse si vous voulez transmettre les documents précédents)";
-static const string KAZ_PLAIN_WARNING		= "Attention : Kaz a dépollué ce message. Les pièces jointes ont été retirées et placées dans un dépôt provisoire. Elles seront automatiquement supprimées dans 1 mois. Si elles sont importantes et que vous souhaitez les conserver, vous devez utiliser les liens ci-dessous. Pour mieux comprendre la politique de nos services visitez kaz.bzh";
-static const string KAZ_PLAIN_DOWLOAD_ONE	= "Vos pièces jointes sont à télécharger individuellement ici :";
-static const string KAZ_PLAIN_DOWLOAD_OTHER	= "(Contenu dans des messages précédents)";
-static const string KAZ_PLAIN_DOWLOAD_ALL	= "Vous pouvez télécharger l'ensemble dans une archive là :";
 
-static const string HEAD			= "<head>";
-static const string HEAD_END			= "</head>";
-static const string KAZ_CSS_URL			= "https://kaz.bzh/m/email.css";
-static const string KAZ_CSS			= "<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" href=\""+KAZ_CSS_URL+"\"/>";
-static const string A_END			= "</a>";
-static const string LI_BEGIN			= "<li";
-static const string CLASS_ONE			= "class=\"one\"";
-static const string LI_ONE			= LI_BEGIN+" "+CLASS_ONE+">";
-static const string LI_ALL			= LI_BEGIN+" class=\"all\">";
-static const string LI_END			= "</li>";
-static const string HREF_ONE			= "href=\"";
-static const string BODY_END			= "</body>";
-static const string HTML_END			= "</html>";
 
-static const string KAZ_HTML_TAG		= "<!--KAZ"; // don't end whith space
+static const string KAZ_PLAIN_HR		("______________________________________________________________________________");
-static const string KAZ_HTML_START		= KAZ_HTML_TAG+" START-->";
+static const string KAZ_PLAIN_START		("~~ PJ-KAZ !"); // don't end whith space
-static const string KAZ_HTML_STOP		= KAZ_HTML_TAG+" STOP-->";
+static const string KAZ_PLAIN_STOP		(KAZ_PLAIN_START+" ~~");
+static const string KAZ_PLAIN_DONT_TOUCH	("(conservez cette partie intacte dans votre réponse si vous voulez transmettre les documents précédents)");
+static const string KAZ_PLAIN_WARNING	        ("Attention : Kaz a dépollué ce message. Les pièces jointes ont été retirées et placées dans un dépôt provisoire. "
+						 "Elles seront automatiquement supprimées dans 1 mois. "
+						 "Si elles sont importantes et que vous souhaitez les conserver, vous devez utiliser les liens ci-dessous. "
+						 "Pour mieux comprendre la politique de nos services visitez kaz.bzh");
+static const string KAZ_PLAIN_DOWLOAD_ONE	("Vos pièces jointes sont à télécharger individuellement ici :");
+static const string KAZ_PLAIN_DOWLOAD_OTHER	("(Contenu dans des messages précédents)");
+static const string KAZ_PLAIN_DOWLOAD_ALL	("Vous pouvez télécharger l'ensemble dans une archive là :");
+
+static const string HEAD			("<head>");
+static const string HEAD_END			("</head>");
+static const string KAZ_CSS_URL			("https://kaz.bzh/m/email.css");
+static const string KAZ_CSS			("<link rel=\"stylesheet\" type=\"text/css\" charset=\"utf-8\" href=\""+KAZ_CSS_URL+"\"/>");
+static const string A_END			("</a>");
+static const string LI_BEGIN			("<li");
+static const string CLASS_ONE			("class=\"one\"");
+static const string LI_ONE			(LI_BEGIN+" "+CLASS_ONE+">");
+static const string LI_ALL			(LI_BEGIN+" class=\"all\">");
+static const string LI_END			("</li>");
+static const string HREF_ONE			("href=\"");
+static const string BODY_END			("</body>");
+static const string HTML_END			("</html>");
+
+static const string KAZ_HTML_TAG		("<!--KAZ"); // don't end whith space
+static const string KAZ_HTML_START		(KAZ_HTML_TAG+" START-->");
+static const string KAZ_HTML_STOP		(KAZ_HTML_TAG+" STOP-->");
 // Textes précédents encodés en SGML
-static const string KAZ_HTML_DONT_TOUCH		= "(conservez cette partie intacte dans votre r&eacute;ponse si vous voulez transmettre les documents pr&eacute;c&eacute;dents)";
+static const string KAZ_HTML_DONT_TOUCH		("(conservez cette partie intacte dans votre r&eacute;ponse si vous voulez transmettre les documents pr&eacute;c&eacute;dents)");
-static const string KAZ_HTML_DOWLOAD_ONE	= "Vos pi&egrave;ces jointes sont &agrave; t&eacute;l&eacute;charger individuellement ici :";
+static const string KAZ_HTML_DOWLOAD_ONE	("Vos pi&egrave;ces jointes sont &agrave; t&eacute;l&eacute;charger individuellement ici :");
-static const string KAZ_HTML_DOWLOAD_OTHER	= "(Contenu dans des messages pr&eacute;c&eacute;dents)";
+static const string KAZ_HTML_DOWLOAD_OTHER      ("(Contenu dans des messages pr&eacute;c&eacute;dents)");
-static const string KAZ_HTML_DOWLOAD_ALL	= "Vous pouvez t&eacute;l&eacute;charger l'ensemble dans une archive l&agrave; :";
+static const string KAZ_HTML_DOWLOAD_ALL	("Vous pouvez t&eacute;l&eacute;charger l'ensemble dans une archive l&agrave; :");
-static const string KAZ_HTML_ARCHIVE		= "archive";
+static const string KAZ_HTML_ARCHIVE		("archive");
+
+static const string KAZ_EMPTY_TEXT_PLAIN	("Content-Type: text/plain; charset=utf-8\n"
+						 "Content-Transfer-Encoding: base64\n");
+
 
 // ================================================================================
 vector <string>
 Attachment::stringsToUpdate ({KAZ_PLAIN_START, "\""+CID});
 
 // ================================================================================
-const string MainAttachment::templatePlainAddLink (" - "+TMPL_DOWNLOAD+" "+TMPL_FILENAME+"\r\n");
+const string MainAttachment::templatePlainAddLink	("  * "+TMPL_FILENAME+" <"+TMPL_DOWNLOAD+">\r\n");
-const string MainAttachment::templatePlainAllLink ("\r\n"+KAZ_PLAIN_DOWLOAD_ALL+"\r\n * "+TMPL_DOWNLOAD+"\r\n");
+const string MainAttachment::templatePlainAllLink	("\r\n  * "+KAZ_PLAIN_DOWLOAD_ALL+" <"+TMPL_DOWNLOAD+">\r\n");
 
-const string MainAttachment::templateHtmlHeader (KAZ_HTML_START+"<p style=\"clear: left; padding: 1pc 0 0 0; font-size:10px; color:#969696;\">"+KAZ_PLAIN_START+"</p><hr>\n"
+const string MainAttachment::templateHtmlHeader		(KAZ_HTML_START+"<p style=\"clear: left; padding: 1pc 0 0 0; font-size:10px; color:#969696;\">"+KAZ_PLAIN_START+"</p><hr>\n"
-						 "<div class=\"kaz\">"
+							 "<div class=\"kaz\">"
-						 "<p style=\"font-size:10px; color:#969696;\">"+KAZ_HTML_DONT_TOUCH+"</p>\n"
+							 "<p style=\"font-size:10px; color:#969696;\">"+KAZ_HTML_DONT_TOUCH+"</p>\n"
-						 "<p>"+KAZ_HTML_DOWLOAD_ONE+"<ul>\n");
+							 "<p>"+KAZ_HTML_DOWLOAD_ONE+"<ul>\n");
-const string MainAttachment::templateHtmlAddLink (LI_ONE+"<a "+HREF_ONE+TMPL_DOWNLOAD+"\">"+TMPL_FILENAME+"</a>"+LI_END+"\n");
+const string MainAttachment::templateHtmlAddLink	(LI_ONE+"<a "+HREF_ONE+TMPL_DOWNLOAD+"\">"+TMPL_FILENAME+"</a>"+LI_END+"\n");
-const string MainAttachment::templateHtmlOtherLink ("</ul>"+KAZ_HTML_DOWLOAD_OTHER+"<ul>\n");
+const string MainAttachment::templateHtmlOtherLink	("</ul>"+KAZ_HTML_DOWLOAD_OTHER+"<ul>\n");
-const string MainAttachment::templateHtmlAllLink ("</ul><ul>"+LI_ALL+KAZ_HTML_DOWLOAD_ALL+" <a href=\""+TMPL_DOWNLOAD+"\">"+KAZ_HTML_ARCHIVE+"</a>"+LI_END+"\n");
+const string MainAttachment::templateHtmlAllLink	("</ul><ul>"+LI_ALL+KAZ_HTML_DOWLOAD_ALL+" <a href=\""+TMPL_DOWNLOAD+"\">"+KAZ_HTML_ARCHIVE+"</a>"+LI_END+"\n");
-const string MainAttachment::templateHtmlFooter ("</ul></p>\n"
+const string MainAttachment::templateHtmlFooter		("</ul></p>\n"
-						 "<p class=\"msg\"><a class=\"kaz\" href=\""+KAZ_WEB_SITE+"\"> "+KAZ_WEB_SITE+" </a></p></div>\n"
+							 "<p class=\"msg\"><a class=\"kaz\" href=\""+KAZ_WEB_SITE+"\"> "+KAZ_WEB_SITE+" </a></p></div>\n"
-						 "<hr><p style=\"font-size:10px; color:#969696;\">"+KAZ_PLAIN_STOP+"</p>"+KAZ_HTML_STOP+"\n");
+							 "<hr><p style=\"font-size:10px; color:#969696;\">"+KAZ_PLAIN_STOP+"</p>"+KAZ_HTML_STOP+"\n");
 
-const regex MainAttachment::whiteSpaceRegEx ("\\s+");
+const regex MainAttachment::whiteSpaceRegEx		("\\s+");
 
 // ================================================================================
 void
@@ -163,11 +175,12 @@ void
 MainAttachment::addLink (string &plain, string &html, const string &url, const string &name) const {
   string plainNewOneLink (templatePlainAddLink);
   replaceAll (plainNewOneLink, TMPL_DOWNLOAD, url);
-  replaceAll (plainNewOneLink, TMPL_FILENAME, name);
+  replaceAll (plainNewOneLink, TMPL_FILENAME, "\""+name+"\"");
   plain += plainNewOneLink;
   string htmlNewOneLink (templateHtmlAddLink);
   string codedUrl (url);
-  replaceAll (codedUrl, "&", "&amp;");
+  // XXX amp ?
+  //replaceAll (codedUrl, "&", "&amp;");
   replaceAll (htmlNewOneLink, TMPL_DOWNLOAD, codedUrl);
   replaceAll (htmlNewOneLink, TMPL_FILENAME, name);
   html += htmlNewOneLink;
@@ -211,18 +224,18 @@ MainAttachment::getDisclaim (string &plain, string &html) const {
   plain = "\r\n"+KAZ_PLAIN_START+"\r\n"+KAZ_PLAIN_HR+"\r\n"+KAZ_PLAIN_DONT_TOUCH+"\r\n\r\n"+KAZ_PLAIN_WARNING+"\r\n\r\n"+KAZ_PLAIN_DOWLOAD_ONE+"\r\n"+plainNewLinks;
   html = templateHtmlHeader+htmlNewLinks;
   if (previousLinks.size ()) {
-    plain += KAZ_PLAIN_DOWLOAD_OTHER+"\r\n"+plainOldLinks;
+    plain += "\r\n"+KAZ_PLAIN_DOWLOAD_OTHER+"\r\n"+plainOldLinks;
     html += templateHtmlOtherLink+htmlOldLinks;
   }
   if (linkCount > 1 && archiveDownloadURL.length ()) {
     string allPlainLinks (templatePlainAllLink);
     replaceAll (allPlainLinks, TMPL_DOWNLOAD, archiveDownloadURL);
     plain += allPlainLinks;
-    string allLinks (templateHtmlAllLink);
+    string allHtmlLinks (templateHtmlAllLink);
-    replaceAll (allLinks, TMPL_DOWNLOAD, archiveDownloadURL);
+    replaceAll (allHtmlLinks, TMPL_DOWNLOAD, archiveDownloadURL);
-    html += allLinks;
+    html += allHtmlLinks;
   }
-  html += templateHtmlFooter;
+  html += templateHtmlFooter+"\r\n";
   plain += "\r\n\r\n"+KAZ_WEB_SITE+"\r\n"+KAZ_PLAIN_HR+"\r\n"+KAZ_PLAIN_STOP+"\r\n";
   // & => &amp; done
   LOG ("plain: " << plain);
@@ -239,12 +252,13 @@ MainAttachment::addPrevious (const string &href, const string &name, const bool
   if (oldVal.length () && name.length () && !trust)
     return;
   previousLinks.erase (href);
-  previousLinks [href] = name;
+  previousLinks [href] = regex_replace (name, regex (R"([\t\r\n\"]+|(\\\")|(>\s*))"), "");
   LOG ("inserted: " << href << ": " << previousLinks[href]);
 }
 
 void
 MainAttachment::extractLinks (const string &extractedPlainKAZ) {
+  // plain text => "* name <url>"
   DEF_LOG ("Attachment::extractedPlainKAZ", "extractedPlainKAZ: " << extractedPlainKAZ);
   for (string::size_type startPos (0);
        (startPos = extractedPlainKAZ.find ("http", startPos)) != string::npos;
@@ -255,24 +269,32 @@ MainAttachment::extractLinks (const string &extractedPlainKAZ) {
     const string href (extractedPlainKAZ.substr (startPos, stopPos-startPos));
     LOG ("plain href: " << href);
 
-    if (extractedPlainKAZ [stopPos] && extractedPlainKAZ [stopPos] != '\n')
+    if (extractedPlainKAZ [stopPos])
       ++stopPos;
+    streamoff stopName = startPos;
     startPos = stopPos;
+
     // get all href but KAZ_WEB_SITE
     // the archive link will be skip by filter.sh
     if (href == KAZ_WEB_SITE)
       continue;
 
-    string::size_type nextPos = extractedPlainKAZ.find ("http", startPos);
+    // backward find name
-    string name (extractedPlainKAZ, startPos, (nextPos == string::npos ? extractedPlainKAZ.length () : nextPos) - startPos);
+    string::size_type startName = extractedPlainKAZ.rfind ("* ", stopName);
-    // skip [> \r\n\t]
+    string name;
-    nextPos = name.find_first_not_of ("[> \t\r\n]");
+
-    if (nextPos != string::npos)
+    if (startName != string::npos) {
-      name.erase (0, nextPos);
+      name = string (extractedPlainKAZ, startName+3, stopName - startName - 3);
-    // stop before [>\r\n\t]
+      // skip [> \r\n\t]
-    nextPos = name.find_first_of ("[>\t\r\n]");
+      string::size_type nextPos = name.find_first_not_of ("[>< \t\r\n\"]");
-    if (nextPos != string::npos)
+      if (nextPos != string::npos)
-      name.erase (nextPos);
+	name.erase (0, nextPos);
+      // stop before [>\r\n\t]
+      nextPos = name.find_first_of ("[\"<]");
+      if (nextPos != string::npos)
+	name.erase (nextPos);
+    }
+
     LOG ("plain name: " << name);
     addPrevious (href, name);
   }
@@ -281,6 +303,7 @@ MainAttachment::extractLinks (const string &extractedPlainKAZ) {
 // ================================================================================
 void
 MainAttachment::extractLinks (const vector<string> &liOne) {
+  // html text => "<li ...><a href="url">name</a>"
   DEF_LOG ("Attachment::extractedPlainKAZ", "liOne.size: " << liOne.size ());
   for (const string &one : liOne) {
     if (caseInsensitiveFind (one, CLASS_ONE) == string::npos)
@@ -353,16 +376,19 @@ MainAttachment::extractPreviousKAZ (ifstream &mbox) {
 void
 MainAttachment::removePreviousArchive () {
   vector<string> toRemove;
-  for (map <string, string>::const_iterator it = previousLinks.begin (); it != previousLinks.end (); ++it)
+  for (map <string, string>::const_iterator it = previousLinks.begin (); it != previousLinks.end (); ++it) {
-    if (it->first.find ("&l=/") != string::npos)
+    const string key (it->first);
-      toRemove.push_back (it->first);
+    if (regex_match (key, archiveURLSignature))
+      toRemove.push_back (key);
+  }
   for (string old : toRemove)
     previousLinks.erase (old);
 }
 
 // ================================================================================
 MainAttachment::MainAttachment (ifstream &mbox)
-  : Attachment (mbox, initTmpLevel (), 0, initTmpPos ()) {
+  : Attachment (mbox, initTmpLevel (), 0, initTmpPos ()),
+    forceMainText (false) {
   DEF_LOG ("MainAttachment::MainAttachment", "");
   string line;
   for (; getline (mbox, line); )
@@ -376,6 +402,7 @@ MainAttachment::markSignificant (const streamoff &minAttachSize, ifstream &mbox)
   DEF_LOG ("MainAttachment::markSignificant", "minAttachSize: " << minAttachSize);
   bool plainMarked (false), htmlMarked (false);
   markDisclaim (plainMarked, htmlMarked);
+  forceMainText = ! (plainMarked || htmlMarked);
   Attachment::markSignificant ("", minAttachSize, mbox, allMarkedPtrs);
 }
 
@@ -511,7 +538,7 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min
       }
       if (attachP->cid.length ()) {
 	string tmp (attachP->downloadUrl);
-	replaceAll (tmp, "&", "&amp;");
+	//replaceAll (tmp, "&", "&amp;");
       	translateHtml.insert (pair<const string, const string> (CID+attachP->cid, tmp));
       }
     }
@@ -520,15 +547,31 @@ MainAttachment::substitute (ifstream &mbox, ofstream &outbox, const SizeArg &min
       continue;
     for (EmbeddedData &embedded : attachP->embeddedData)
       readDownloadUrl (embedded.downloadUrl);
+    // XXX test empty ?
   }
   readArchiveUrl ();
+  removePreviousArchive ();
   string plainDisclaim, htmlDisclaim;
   getDisclaim (plainDisclaim, htmlDisclaim);
   // copy email
   streamoff curPos = 0;
+  if (forceMainText) {
+    cerr << endl << endl << "          #################### coucou " << forceMainText << " " << contentPos << " " << *this << endl;
+    // check no main text
+    LOG ("Force main text");
+    LOG_BUG (boundary.empty () || ! subAttachements.size (), /**/, "eMailShrinker: can't force add footer M9: : " << *this);
+    copy (mbox, outbox, curPos, contentPos);
+    curPos = contentPos;
+    cerr << "          #################### coucou " << curPos << endl << endl;
+    string content (plainDisclaim);
+    base64Encode (content);
+    outbox << boundary.substr (0, boundary.length () -2) << endl
+	   << KAZ_EMPTY_TEXT_PLAIN << endl
+	   << content << endl;
+    outbox.flush ();
+  }
   for (Attachment *attachP : allMarkedPtrs) {
     copy (mbox, outbox, curPos, attachP->beginInParent);
-
     LOG_BUG (attachP->toUpdate && attachP->toExtract, /**/, "eMailShrinker: bug M5: update and extract. pos: " << attachP->beginPos);
 
     if (attachP->toExtract) {

src/cpp/eMailShrinker.cpp

@@ -32,7 +32,7 @@
 // knowledge of the CeCILL-B license and that you accept its terms.	  //
 ////////////////////////////////////////////////////////////////////////////
 
-#define LAST_VERSION "2.0 2022-02-08 eMailShrinker"
+#define LAST_VERSION "2.1 2022-10-30 eMailShrinker"
 
 #include <iostream>
 #include <fstream>
@@ -188,10 +188,10 @@ main (int argc, char** argv) {
   MainAttachment attachment (mbox);
   mbox.close ();
 
-  if (attachment.getBoundary ().empty ()) {
+  // if (attachment.getBoundary ().empty ()) {
-    cerr << "no attachment" << endl;
+  //   cerr << "no attachment" << endl;
-    return 1;
+  //   return 1;
-  }
+  // }
   // parse structure
   mbox.open (inputName);
   attachment.markSignificant (minAttachSize, mbox);

src/cpp/jirafeauAPI.cpp

@@ -32,7 +32,7 @@
 // knowledge of the CeCILL-B license and that you accept its terms.	  //
 ////////////////////////////////////////////////////////////////////////////
 
-#define LAST_VERSION "1.0 2021-02-21 jirafeauAPI"
+#define LAST_VERSION "1.1 2022-10-30 jirafeauAPI"
 
 #include <iostream>
 #include <string>
@@ -122,8 +122,8 @@ main (int argc, char** argv) {
     contentType,
     attachName,
     urlBase ("http://file.kaz.bzh"),
-    apiPage ("/script.php"),
+    uploadPage ("/a.php"),
-    downloadPage ("/f.php"),
+    updatePage ("/a.php"),
     minimumAvailability ("month"),
     proxy;
 
@@ -144,8 +144,8 @@ main (int argc, char** argv) {
       ("useTheForceLuke", bool_switch (&useTheForceLuke), "display hidded options")
       ("debug,g", bool_switch (&debugFlag), "debug mode")
       ("proxy,p", value<string> (&proxy)->default_value (proxy), "set proxy (proxy-host.org:8080)")
-      ("uploadPage,u", value<string> (&apiPage)->default_value (apiPage), "upload page")
+      ("uploadPage,u", value<string> (&uploadPage)->default_value (uploadPage), "upload page")
-      ("downloadPage,d", value<string> (&downloadPage)->default_value (downloadPage), "download page")
+      ("updatePage,v", value<string> (&updatePage)->default_value (updatePage), "update page")
       ;
 
     options_description cmd ("All options");
@@ -220,8 +220,8 @@ main (int argc, char** argv) {
 
   switch (jirCmd) {
   case SEND: {
-    LOG ("SEND: " << (urlBase+apiPage));
+    LOG ("SEND: " << (urlBase+uploadPage));
-    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+apiPage).c_str ());
+    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+uploadPage).c_str ());
 
     LOG ("maxUploadSize: " << maxUploadSize);
     long uploadsize = (size_t) maxUploadSize;
@@ -264,8 +264,8 @@ main (int argc, char** argv) {
     break;
 
   case UPDATE: {
-    LOG ("UPDATE: " << (urlBase+downloadPage));
+    LOG ("UPDATE: " << (urlBase+updatePage));
-    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+downloadPage).c_str ());
+    curl_easy_setopt (easyhandle, CURLOPT_URL, (urlBase+updatePage).c_str ());
 
     LOG ("h: " << inputFileName);
     part = curl_mime_addpart (multipart);
@@ -281,12 +281,13 @@ main (int argc, char** argv) {
   }
 
   curl_easy_setopt (easyhandle, CURLOPT_MIMEPOST, multipart);
-  curl_easy_perform (easyhandle);
+  CURLcode res (curl_easy_perform (easyhandle));
   curl_easy_cleanup (easyhandle);
   cout << readBuffer << endl;
 
   showTime ("Upload");
-
+  if (res != CURLE_OK)
+    cerr << prog << " failed: " << curl_easy_strerror (res) << endl;
   return 0;
 }
 

src/include/Attachment.hpp

@@ -35,9 +35,9 @@
 #ifndef _kaz_Attachment_hpp
 #define _kaz_Attachment_hpp
 
-#include <string>
-#include <regex>
 #include <map>
+#include <regex>
+#include <string>
 #include <utility>
 
 #include "EmbeddedData.hpp"

src/include/MainAttachment.hpp

@@ -83,6 +83,8 @@ namespace kaz {
     bfs::path	extractDir;
     /*! URL for download archives */
     string	archiveDownloadURL;
+    /*! no main text in email can be use to add disclaim */
+    bool forceMainText;
     
     /*! subset in the tree of all attachments to be consider for extraction or modification */
     vector<Attachment *>		allMarkedPtrs;