diff --git a/dockers/postfix2/Dockerfile b/dockers/postfix2/Dockerfile deleted file mode 100644 index 77711c0..0000000 --- a/dockers/postfix2/Dockerfile +++ /dev/null @@ -1,57 +0,0 @@ -FROM docker.io/mailserver/docker-mailserver:11.3.1 - -######################################## -# APT local cache -# work around because COPY failed if no source file -COPY .dummy .apt-mirror-confi[g] .proxy-confi[g] / -RUN cp /.proxy-config /etc/profile.d/proxy.sh 2> /dev/null || true -RUN if [ -f /.apt-mirror-config ] ; then . /.apt-mirror-config && sed -i \ - -e "s/deb.debian.org/${APT_MIRROR_DEBIAN}/g" \ - -e "s/security.debian.org/${APT_MIRROR_DEBIAN_SECURITY}/g" \ - -e "s/archive.ubuntu.com/${APT_MIRROR_UBUNTU}/g" \ - -e "s/security.ubuntu.com/${APT_MIRROR_UBUNTU_SECURITY}/g" \ - /etc/apt/sources.list; fi - -######################################## -RUN apt-get update -RUN apt-get -y autoremove -RUN apt-get install -y locales locales-all -RUN sed -i '/fr_FR.UTF-8/s/^# //g' /etc/locale.gen && locale-gen -ENV LC_ALL fr_FR.UTF-8 -ENV LANG fr_FR.UTF-8 -ENV LANGUAGE fr_FR:fr -RUN update-locale LANG=fr_FR.UTF-8 - -RUN apt-get -y install rsyslog apt-utils apg gawk altermime -RUN apt-get -y install libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libcurl4-gnutls-dev doxygen -#RUN apt-get -y install emacs elpa-php-mode -RUN apt-get -y install vim nano mailutils bsd-mailx procps dos2unix - -# creation du user filter,son repertoire home, copie des fichiers -RUN mkdir /home/filter ; useradd -d /home/filter filter ; chown filter /home/filter -COPY dockers/postfix2/filter/* /home/filter/ -RUN chown filter /home/filter/*; chmod 755 /home/filter/* - -# creation du repertoire filter et application des bons droits pour le filtre -RUN touch /var/log/mail/filter.log ; chown filter /var/log/mail/filter.log ; chmod 777 /var/log/mail/filter.log -RUN mkdir -p /var/spool/filter ; chmod 775 /var/spool/filter ; chown filter /var/spool/filter -RUN mkdir -p /var/log/mail/pb ; chmod a+rwx /var/log/mail/pb -RUN sed -i '5i/var/log/mail/filter.log' /etc/logrotate.d/rsyslog - -# modif des fichiers de postfix -RUN cat /home/filter/master.cf.update >>/etc/postfix/master.cf -RUN sed -i -e 's/reject_rbl_client bl.spamcop.net$//g' /etc/postfix/main.cf -RUN awk -i inplace 'BEGIN {cp=0} /127.0.0.1:10025/ {cp=1} /content_filter=/ {if (cp) gsub("content_filter=.*", "content_filter=filter:dummy"); print $0; cp=0; next} {print}' /etc/postfix/master.cf - -# pour le confort : modif du .bashrc de root -RUN sed -i 's/# alias/alias/g' /root/.bashrc -RUN /etc/init.d/postfix restart - -RUN echo "#!/bin/bash" > /entrypoint.sh -RUN echo "/usr/bin/supervisord -c /etc/supervisor/supervisord.conf" >> /entrypoint.sh -RUN chmod u+x /entrypoint.sh - -# HOTFIX DMARC -RUN chmod 777 /var/run/opendmarc/ - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/dockers/postfix2/Readme.txt b/dockers/postfix2/Readme.txt deleted file mode 100644 index 9fc9764..0000000 --- a/dockers/postfix2/Readme.txt +++ /dev/null @@ -1,14 +0,0 @@ -url du docker iintial avec toutes la doc: https://github.com/tomav/docker-mailserver - -le script pour géréer la conf de postfix et les BAL : ./setup.sh help -comme l'image a changé de "tvial/docker-mailserver:latest" en "postfixkaz:latest", il faudra penser à utiliser l'option -i IMAGE_NAME avec setup.sh - -Fabrication du docker avec le fichier Dockerfile -Cela utilise - - Dockerfile : le fichier de description - -# docker build -t postfixkaz . - - -le postfix-main.cf : -virtual_alias_maps = ldap:/etc/postfix/ldap-aliases.cf, ldap:/etc/postfix/ldap-groups.cf, texthash:/etc/postfix/virtual diff --git a/dockers/postfix2/build.sh b/dockers/postfix2/build.sh deleted file mode 100755 index 5c63c02..0000000 --- a/dockers/postfix2/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -KAZ_ROOT=$(cd $(dirname $0)/../..; pwd) -. "${KAZ_ROOT}/bin/.commonFunctions.sh" -setKazVars - -#"${KAZ_BIN_DIR}/installDepollueur.sh" - -printKazMsg "\n *** Création du Dockerfile Postfix" - -cd "${KAZ_ROOT}" -mkdir -p dockers/postfix2/filter/ -rsync -a git/depollueur/src/bash/* git/depollueur/build/out/* dockers/postfix2/filter/ - -docker build -t postfixkaz . -f dockers/postfix2/Dockerfile - diff --git a/dockers/postfix2/config b/dockers/postfix2/config deleted file mode 120000 index 8ba1243..0000000 --- a/dockers/postfix2/config +++ /dev/null @@ -1 +0,0 @@ -/var/lib/docker/volumes/postfix2_mailConfig/_data/ \ No newline at end of file diff --git a/dockers/postfix2/docker-compose.yml b/dockers/postfix2/docker-compose.yml index d3561a9..6e7cf0a 100644 --- a/dockers/postfix2/docker-compose.yml +++ b/dockers/postfix2/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: mail: - image: postfixkaz + image: docker.io/mailserver/docker-mailserver:latest hostname: ${smtpHost} domainname: ${domain} container_name: ${smtpServName} diff --git a/dockers/postfix2/filter/domainname b/dockers/postfix2/filter/domainname deleted file mode 100644 index 6abcd66..0000000 --- a/dockers/postfix2/filter/domainname +++ /dev/null @@ -1 +0,0 @@ -kaz.bzh diff --git a/dockers/postfix2/filter/eMailShrinker b/dockers/postfix2/filter/eMailShrinker deleted file mode 100755 index 5150e58..0000000 Binary files a/dockers/postfix2/filter/eMailShrinker and /dev/null differ diff --git a/dockers/postfix2/filter/filter.sh b/dockers/postfix2/filter/filter.sh deleted file mode 100755 index 6be24a4..0000000 --- a/dockers/postfix2/filter/filter.sh +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/bash -########################################################################## -# Copyright KAZ 2021 # -# # -# contact (at) kaz.bzh # -# # -# This software is a filter to shrink email by attachment extraction. # -# # -# This software is governed by the CeCILL-B license under French law and # -# abiding by the rules of distribution of free software. You can use, # -# modify and/or redistribute the software under the terms of the # -# CeCILL-B license as circulated by CEA, CNRS and INRIA at the following # -# URL "http://www.cecill.info". # -# # -# As a counterpart to the access to the source code and rights to copy, # -# modify and redistribute granted by the license, users are provided # -# only with a limited warranty and the software's author, the holder of # -# the economic rights, and the successive licensors have only limited # -# liability. # -# # -# In this respect, the user's attention is drawn to the risks associated # -# with loading, using, modifying and/or developing or reproducing the # -# software by the user in light of its specific status of free software, # -# that may mean that it is complicated to manipulate, and that also # -# therefore means that it is reserved for developers and experienced # -# professionals having in-depth computer knowledge. Users are therefore # -# encouraged to load and test the software's suitability as regards # -# their requirements in conditions enabling the security of their # -# systems and/or data to be ensured and, more generally, to use and # -# operate it in the same conditions as regards security. # -# # -# The fact that you are presently reading this means that you have had # -# knowledge of the CeCILL-B license and that you accept its terms. # -########################################################################## - -########################################################################## -# - installer l'utilitaire apg pour génération de mot de passes -# - installer l'utilitaire dos2unix -# - le contenu de INSPECT_DIR doit être accessible en écriture pour le -# proriétaire du script -# - shrinkEMail et jirafeau.sh doivent être accessible en execution pour -# le roriétaire du script -# - il faut que root fasse avant : -# mkdir -p "${DIR_LOG}/pb/" ; chmod a+rwx "${DIR_LOG}/pb/" -########################################################################## - -DEFAULT_MODE="footer" -DEFAULT_PERIOD="month" -DEFAULT_TRACK="" - -cd $(dirname $0) -DOMAINNAME=$(cat domainname) -# Exit codes from -EX_TEMPFAIL=75 -EX_UNAVAILABLE=69 -EX_TOO_LARGE=552 -INSPECT_DIR=/var/spool/filter -DIR_LOG=/var/log/mail -FIC_LOG="${DIR_LOG}/filter.log" -TMP_LOG="$(mktemp)" -SENDMAIL="/usr/sbin/sendmail -G -i" -MAILS=/tmp/FILTER -MAX_KEEP_IN_MAIL=5ki -MAX_UPLOAD_SIZE=1Gi -SHRINK_CMD=/home/filter/eMailShrinker -JIRAFEAU_CMD=/home/filter/jirafeauAPI -JIRAFEAU_URL=https://depot.${DOMAINNAME:-"kaz.bzh"} -JIRAFEAU_LOCAL=http://depot -MD5_CMD=/usr/bin/md5sum -DISCLAMER_CMD=altermime -MAX_FINAL_SIZE=2097152 # 2Mi -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 () { - echo "${BLUE}$(date +%d-%m-%Y-%H-%M-%S)${NC} : $*" >> "${TMP_LOG}" -} - -quitFilter () { - LOG_FIC "${GREEN}######################################## filter stop${NC}" - cat "${TMP_LOG}" >> "${FIC_LOG}" - rm -f "${TMP_LOG}" - exit $1 -} - -keepFailed () { - [ -z "${KEEP_FAILED}" ] && return - cp "$1" "${DIR_LOG}/pb/" -} - -######################################## -# curl Jirafeau -curlJirafeauUpdate () { - # $1: periode - # $2: jirafeauItemRef - LOG_FIC " - ${CYAN}curl -X POST -d \"u=$1\" -d \"h=$2\" \"${JIRAFEAU_LOCAL}/a.php}\"" - curl -X POST -d "u=$1" -d "h=$2" "${JIRAFEAU_LOCAL}/a.php" -} - -curlJirafeauSend () { - # $1: periode - # $2: filename - # $3: content-type - # $4: name - # $5: password - - type=$3 - [ -z "${type}" ] && type="text/plain" - LOG_FIC " - curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;type=${type};filename=\\\"$4\\\"\" \"${JIRAFEAU_LOCAL}/a.php\"" - for num in {1..2}; do - OUTPUT=$(curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=${type};filename=\"$4\"" "${JIRAFEAU_LOCAL}/a.php") - read JIR_TOKEN <<< "${OUTPUT}" - case "${JIR_TOKEN}" in - "" | no | *Error* | \<* ) - sleep 30 - continue - ;; - esac - break - done - echo "${OUTPUT}" -} - -#################### MAIN ################################################# -echo "${NL}${BLUE}$(date +%d-%m-%Y-%H-%M-%S)${NC} : ${GREEN}######################################## filter start (log in ${TMP_LOG})${NC}" >> "${FIC_LOG}" -LOG_FIC "${GREEN}######################################## ${TMP_LOG} ${NC}" - -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="${MAILS}/${DATE_TEMPS}_${MAIL_SOURCE}_$$" - -MODE=$(curl "${JIRAFEAU_LOCAL}/a.php?m=${MAIL_SOURCE}" 2>/dev/null ) -[[ "${MODE}" =~ ^(none|footer|attachment|both)$ ]] || MODE="${DEFAULT_MODE}" -TRACK=$(curl "${JIRAFEAU_LOCAL}/a.php?r=${MAIL_SOURCE}" 2>/dev/null ) -[[ "${TRACK}" =~ ^(|0|1|false|true|FALSE|TRUE|on|off)$ ]] || TRACK="${DEFAULT_TRACK}" -PERIOD=$(curl "${JIRAFEAU_LOCAL}/a.php?p=${MAIL_SOURCE}" 2>/dev/null ) -[[ "${PERIOD}" =~ ^(minute|hour|day|week|month|quarter)$ ]] || PERIOD="${DEFAULT_PERIOD}" - -LOG_FIC "${NL}" \ - " MAIL_SOURCE : ${YELLOW}${MAIL_SOURCE}${NC}${NL}" \ - " DATE_TEMPS : ${YELLOW}${DATE_TEMPS=}${NC}${NL}" \ - " MODE : ${YELLOW}${MODE}${NC}${NL}" \ - " TRACK : ${YELLOW}${TRACK}${NC}${NL}" \ - " PERIOD : ${YELLOW}${PERIOD}${NC}${NL}" - -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" -# anciens liens à réactiver -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. -[ -z "${DEBUG}" ] && trap "cd ${INSPECT_DIR}; rm -rf in.$$ in.$$.altered ${REP_PIECE_JOINTE}" 0 1 2 3 15 - -if ! cat > "${INSPECT_DIR}/in.$$"; then - LOG_FIC "${RED}Cannot save mail to file${NC}" - quitFilter "${EX_TEMPFAIL}" -fi -dos2unix "${INSPECT_DIR}/in.$$" 2> /dev/null - -LOG_FIC "${NL}" \ - " size: ${YELLOW}$(wc -c < "${INSPECT_DIR}/in.$$")${NC}" -[ -z "${DEBUG}" ] || (cp "${INSPECT_DIR}/in.$$" "${DIR_LOG}/pb/in.$$.orig") - -mkdir -p "${REP_PIECE_JOINTE}/" ->"${OLD_LINKS}" ->"${ARCHIVE_CONTENT}" - -if [ "${MODE}" = "none" ]; then - LOG_FIC " - ${GREEN}send without change (MODE=none)${NC}" - ${SENDMAIL} "$@" < "${INSPECT_DIR}/in.$$" - quitFilter 0 -fi - -# Etape de rafraichissement des anciens fichiers inclus -echo "time: ${DATE_TEMPS}${NL}id: $(date +%s)" > "${ARCHIVE_CONTENT}" -[ -n "${TRACK}" ] && echo "sender: ${MAIL_SOURCE}" >> "${ARCHIVE_CONTENT}" - -LOG_FIC "${CYAN}${SHRINK_CMD} -u \"${INSPECT_DIR}/in.$$\" 2>> \"${TMP_LOG}\" > \"${OLD_LINKS}\"${NC}" -"${SHRINK_CMD}" -u "${INSPECT_DIR}/in.$$" 2>> "${TMP_LOG}" > "${OLD_LINKS}" - -cat "${OLD_LINKS}" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK; 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 - curlJirafeauUpdate "${PERIOD}" "${REMOTE_REF}" 2>&1 >> "${TMP_LOG}" - echo "old: ${REMOTE_REF} ${REMOTE_KEY}" >> "${ARCHIVE_CONTENT}" -done -LOG_FIC " - archive starts with: ${NL}${YELLOW}$(cat ${ARCHIVE_CONTENT})${NC}" - -# Etape extraction des pieces jointes -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>> "${TMP_LOG}" | { - while read ATTACH_TMP_NAME; do - 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 -M cln) - PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \ -f 1) - curlJirafeauSend "${PERIOD}" "${ATTACH_MEDIA}" "${ATTACH_CONTENT_TYPE}" "${ATTACH_NAME}" "${PASSWORD}" 2>> "${TMP_LOG}" > "${ONE_LINK}" - cat "${ONE_LINK}" | { - read JIR_TOKEN - read JIR_CODE - LOG_FIC " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}" - case "${JIR_TOKEN}" 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 "url:" - keepFailed "${INSPECT_DIR}/in.$$" - echo "UPLOAD_FAIL" >> "${JIRAFEAU_ERROR}" - ;; - * ) - LOG_FIC " - change by link ${YELLOW}${JIRAFEAU_URL}/f.php?d=0&h=${JIR_TOKEN}&k=${PASSWORD_MD5}${NC}" - echo "url: ${JIRAFEAU_URL}/f.php?d=0&h=${JIR_TOKEN}&k=${PASSWORD_MD5}" - echo "new: ${JIR_TOKEN} ${PASSWORD_MD5}" >> "${ARCHIVE_CONTENT}" - ;; - esac - } - done - # Création de l'archive - 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 -M cln) - PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \ -f 1) - LOG_FIC " - ${MAGENTA}upload archive${NC}" - - curlJirafeauSend "${PERIOD}" "${ARCHIVE_CONTENT}" "${ARCHIVE_MIME}" "${ARCHIVE_TITLE}" "${PASSWORD}" 2>> "${TMP_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 " - return code ${YELLOW}${JIR_TOKEN}${NC} / ${YELLOW}${JIR_CODE}${NC}" - case "${JIR_TOKEN}" in - "" | no | *Error* | \<* ) - LOG_FIC " - ${RED}can't upload archive (${JIR_TOKEN}) , substitution couldn't be done${NC}" - echo "arch: bad" - keepFailed "${INSPECT_DIR}/in.$$" - echo "ARCHIVE_FAIL" >> "${JIRAFEAU_ERROR}" - ;; - * ) - 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 " - no archive (less than 2 attach file)" - echo "arch: none" - fi - # Etape de substitution - LOG_FIC "${CYAN}${SHRINK_CMD} -m \"${MODE}\" -s \"${MAX_KEEP_IN_MAIL}\" \"${INSPECT_DIR}/in.$$\" \"${INSPECT_DIR}/in.$$.altered\" 2>> \"${TMP_LOG}\"${NC}" -} | "${SHRINK_CMD}" -m "${MODE}" -s "${MAX_KEEP_IN_MAIL}" "${INSPECT_DIR}/in.$$" "${INSPECT_DIR}/in.$$.altered" 2>> "${TMP_LOG}" - -[ -z "${DEBUG}" ] || (cp "${INSPECT_DIR}/in.$$.altered" "${DIR_LOG}/pb/in.$$.altered") - -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 " - ${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}" - ${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 " - ${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}" - ${SENDMAIL} "$@" < "${INSPECT_DIR}/in.$$" -fi - -quitFilter 0 - -########################################################################## diff --git a/dockers/postfix2/filter/filterTest.sh b/dockers/postfix2/filter/filterTest.sh deleted file mode 100755 index 77981a9..0000000 --- a/dockers/postfix2/filter/filterTest.sh +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/bash -########################################################################## -# Copyright KAZ 2021 # -# # -# contact (at) kaz.bzh # -# # -# This software is a filter to shrink email by attachment extraction. # -# # -# This software is governed by the CeCILL-B license under French law and # -# abiding by the rules of distribution of free software. You can use, # -# modify and/or redistribute the software under the terms of the # -# CeCILL-B license as circulated by CEA, CNRS and INRIA at the following # -# URL "http://www.cecill.info". # -# # -# As a counterpart to the access to the source code and rights to copy, # -# modify and redistribute granted by the license, users are provided # -# only with a limited warranty and the software's author, the holder of # -# the economic rights, and the successive licensors have only limited # -# liability. # -# # -# In this respect, the user's attention is drawn to the risks associated # -# with loading, using, modifying and/or developing or reproducing the # -# software by the user in light of its specific status of free software, # -# that may mean that it is complicated to manipulate, and that also # -# therefore means that it is reserved for developers and experienced # -# professionals having in-depth computer knowledge. Users are therefore # -# encouraged to load and test the software's suitability as regards # -# their requirements in conditions enabling the security of their # -# systems and/or data to be ensured and, more generally, to use and # -# operate it in the same conditions as regards security. # -# # -# The fact that you are presently reading this means that you have had # -# knowledge of the CeCILL-B license and that you accept its terms. # -########################################################################## - -PRG=$(basename $0) - -ATTACH_MODE="FOOTER" - -BOLD='' -RED='' -GREEN='' -YELLOW='' -BLUE='' -MAGENTA='' -CYAN='' -NC='' # No Color -NL=' -' - -TTY=$(tty) -######################################## -LOG () { - echo "$1" >> "${TTY}" -} - -usage () { - echo "Usage: ${PRG} [-h|-v|-g] [-m {NONE|FOOTER|ATTACHMENT|BOTH}] mbox" - exit 1 -} - -######################################## -# recherche des binaires -mbox=$(realpath "$1") -cd $(dirname $0) -eMailShrinker="$(realpath "./eMailShrinker")" -[ -x "${eMailShrinker}" ] || eMailShrinker="$(realpath "../../build/out/eMailShrinker")" -[ -x "${eMailShrinker}" ] || ( echo "${RED}eMailShrinker not found${NC}" ; exit) - -while : ; do - case "$1" in - -h*) usage;; - -v*) "${eMailShrinker}" -v; exit;; - -g) DEBUG="-g"; shift;; - -m) shift; ATTACH_MODE="$1"; shift;; - *) break;; - esac -done -case "${ATTACH_MODE}" in - ""|NONE|FOOTER|ATTACHMENT|BOTH);; - *) usage;; -esac - -[ -z "${ATTACH_MODE}" ] || ATTACH_MODE="-m ${ATTACH_MODE}" - -[ "$#" -eq 1 ] || usage - -######################################## -dos2unix "${mbox}" -DOMAINNAME="$(cat domainname)" -JIRAFEAU_URL="https://depot.${DOMAINNAME}" -JIRAFEAU_LOCAL="${JIRAFEAU_URL}" - -TMP_DIR="$(mktemp)" - -######################################## -# curl Jirafeau -curlJirafeauUpdate () { - # $1: periode - # $2: jirafeauItemRef - - curl -X POST -d "u=$1" -d "h=$2" "${JIRAFEAU_LOCAL}/a.php" - #"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" update "$2" -} - -curlJirafeauSend () { - # $1: periode - # $2: filename - # $3: content-type - # $4: name - # $5: password - - type=$3 - [ -z "${type}" ] && type="text/plain" - LOG "curl -X POST -F \"time=$1\" -F \"key=$5\" -F \"file=@$2;type=${type};filename=\\\"$4\\\"\" \"${JIRAFEAU_LOCAL}/a.php\"" - curl -X POST -F "time=$1" -F "key=$5" -F "file=@$2;type=${type};filename=\"$4\"" "${JIRAFEAU_LOCAL}/a.php" || exit 1 - #"${jirafeauAPI}" -f "${JIRAFEAU_LOCAL}" -t "$1" -s "1Gi" -c "${type}" -n "$4" send "$2" "$5" -} - -######################################## -# nettoyage -rm -f "${TMP_DIR}" ; mkdir -p "${TMP_DIR}" -rm -fr "${TMP_DIR}/PJ-name.txt" "${TMP_DIR}/PJ-Keys.txt" "${TMP_DIR}/PJ" "${TMP_DIR}/archive-content.txt" "${TMP_DIR}/url-to-refresh.txt" "${TMP_DIR}/new-mbox" - -echo -e "time: $(date "+%Y-%m-%d-%H:%M:%S")\nid: $(date +%s)" > "${TMP_DIR}/archive-content.txt" - -######################################## -# affichage de la structure de départ -LOG " - ${BLUE}mbox: ${mbox}${NC}" -"${eMailShrinker}" -l "${mbox}" -LOG - -######################################## -# recherche des prolongations des délais de grace -"${eMailShrinker}" ${DEBUG} -u "${mbox}" > "${TMP_DIR}/url-to-refresh.txt" 2>> "${TTY}" -cat "${TMP_DIR}/url-to-refresh.txt" | grep "${JIRAFEAU_URL}" | while read REMOTE_LINK; do - REMOTE_REF=$(echo "${REMOTE_LINK}" | sed -e 's/.*h=\([^&]*\).*/\1/' -e 's/.*http.*//') - [ -z "${REMOTE_REF}" ] && continue - LOG " - ${BLUE}update ${REMOTE_REF}${NC}" - curlJirafeauUpdate "month" "${REMOTE_REF}" 2>> "${TTY}" - LOG - echo "old: ${REMOTE_REF} ${REMOTE_KEY}" >> "${TMP_DIR}/archive-content.txt" -done - -######################################## -# extraction des pièces jointes -"${eMailShrinker}" ${DEBUG} -s "5ki" -d "${TMP_DIR}/PJ" "${mbox}" > "${TMP_DIR}/PJ-name.txt" || exit 1 - -LOG " - ${BLUE}PJ-name: ${NC}" -cat "${TMP_DIR}/PJ-name.txt" -LOG - -######################################## -# dépot des extractions dans jirafeau et récupération des codes -cat "${TMP_DIR}/PJ-name.txt" | { - while read ATTACH_TMP_NAME; do - LOG " - ${BLUE}find ATTACH_TMP_NAME: (${ATTACH_TMP_NAME}) ${NC}" - 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 " - ${RED}no ATTACH_TMP_NAME: ${ATTACH_TMP_NAME}${NC}" - # XXX error - continue - fi - LOG " - ${BLUE}find ${ATTACH_NAME} / (${ATTACH_CONTENT_TYPE}) / ${ATTACH_MEDIA} ${NC}" - PASSWORD=$(apg -n 1 -m 12 -M cln) - PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \ -f 1) - curlJirafeauSend "month" "${ATTACH_MEDIA}" "${ATTACH_CONTENT_TYPE}" "${ATTACH_NAME}" "${PASSWORD}" 2>> "${TTY}" > "${TMP_DIR}/one.txt" - - cat "${TMP_DIR}/one.txt" | { - read JIR_TOKEN - read JIR_CODE - case "${JIR_TOKEN}" in - "" | no | *Error* | \<* ) - LOG " - ${RED}can't upload ${ATTACH_MEDIA} <${JIR_TOKEN}> <${JIR_CODE}>${NC}" - cat "${TMP_DIR}/one.txt" >> "${TTY}" - echo "url:" - exit 1 - ;; - * ) - LOG " - ${GREEN} upload ${ATTACH_MEDIA}${NC}" - echo "url: ${JIRAFEAU_URL}/f.php?d=1&h=${JIR_TOKEN}&k=${PASSWORD_MD5}" - echo "new: ${JIR_TOKEN} ${PASSWORD_MD5}" >> "${TMP_DIR}/archive-content.txt" - ;; - esac - } - done - NB_ATTACH=$(grep -e "^old: " -e "^new: " "${TMP_DIR}/archive-content.txt" | wc -l) - if [ "${NB_ATTACH}" -gt 1 ]; then - PASSWORD=$(apg -n 1 -m 12 -M cln) - PASSWORD_MD5=$(echo -n ${PASSWORD} | ${MD5_CMD} | cut -d \ -f 1) - curlJirafeauSend "month" "${TMP_DIR}/archive-content.txt" "text/kaz_email_archive" "archive_content" "${PASSWORD}" 2>> "${TTY}" > "${TMP_DIR}/one.txt" || exit 1 - cat "${TMP_DIR}/one.txt" | { - read JIR_TOKEN - read JIR_CODE - case "${JIR_TOKEN}" in - "" | no | *Error* | \<* ) - LOG " - ${RED}can't upload ${TMP_DIR}/archive-content.txt${NC}" - echo "arch: bad" - exit 1 - ;; - * ) - LOG " - ${GREEN} upload archive-content.txt${NC}" - echo "arch: ${JIRAFEAU_URL}/a.php?g=${JIR_TOKEN}~${PASSWORD_MD5}" - ;; - esac - } - else - LOG " - ${GREEN}no archive${NC}" - echo "arch: none" - fi -} > "${TMP_DIR}/PJ-Keys.txt" - -LOG " - ${BLUE}PJ-Keys: ${NC}" -cat "${TMP_DIR}/PJ-Keys.txt" -LOG - -LOG " - ${GREEN}ATTACH_MODE: ${ATTACH_MODE}${NC}" - -######################################## -# substitution des pièces jointes par les codes fournis par jirafeau -cat "${TMP_DIR}/PJ-Keys.txt" | "${eMailShrinker}" ${DEBUG} ${ATTACH_MODE} -s "5ki" "${mbox}" "${TMP_DIR}/new-mbox" 2>> "${TTY}" || exit 1 - -######################################## -# affichage de la structure à la fin -LOG " - ${BLUE}new-mbox:${NC}" -"${eMailShrinker}" -l "${TMP_DIR}/new-mbox" 2>> "${TTY}" || exit 1 - -echo -e "\nresul in ${TMP_DIR}/new-mbox" -exit 0 diff --git a/dockers/postfix2/filter/jirafeauAPI b/dockers/postfix2/filter/jirafeauAPI deleted file mode 100755 index b8427f3..0000000 Binary files a/dockers/postfix2/filter/jirafeauAPI and /dev/null differ diff --git a/dockers/postfix2/filter/master.cf.update b/dockers/postfix2/filter/master.cf.update deleted file mode 100644 index 63db8e3..0000000 --- a/dockers/postfix2/filter/master.cf.update +++ /dev/null @@ -1,4 +0,0 @@ - -filter unix - n n - 10 pipe - flags=Rq user=filter null_sender= - argv=/home/filter/filter.sh -f ${sender} -- ${recipient} diff --git a/dockers/postfix2/first.sh b/dockers/postfix2/first.sh deleted file mode 100755 index 2cfd851..0000000 --- a/dockers/postfix2/first.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -SERV_DIR=$(cd $(dirname $0); pwd) -KAZ_ROOT=$(cd $(dirname $0)/../..; pwd) -. "${KAZ_ROOT}/bin/.commonFunctions.sh" -setKazVars - -cd $(dirname $0) -. "${DOCKERS_ENV}" - -[ "${mode}" == "local" ] || exit - -checkDockerRunning "${smtpServName}" "Postfix" || exit - -SETUP_MAIL="docker exec -ti mailServ setup" - -printKazMsg "\n *** Premier lancement de Postfix" - -# echo "virtual_alias_maps = ldap:/etc/postfix/ldap-aliases.cf, ldap:/etc/postfix/ldap-groups.cf, texthash:/etc/postfix/virtual" >> config/postfix-main.cf