From 7defb002010aba1fca2479fddae98f546fc8503d Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 26 Mar 2023 01:27:18 +0100 Subject: [PATCH] using PGP SALT/PEPPER QRCODE for pay process --- G1BILLETS.sh | 29 ++++++++++++---------- MAKE_G1BILLET.sh | 59 +++++++++++++++++++++++++++++++++++--------- images/g1ticket.png | Bin 11222 -> 17290 bytes install.sh | 9 +++++-- 4 files changed, 70 insertions(+), 27 deletions(-) diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 9880ed5..07bb343 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -23,29 +23,30 @@ if [[ $MONTANT != "daemon" ]]; then STYLE="$2" DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS -[[ $DICE != ?(-)+([0-9]) ]] && DICE=3 -echo "$DICE WORDS SECRETS (Define length in $MY_PATH/DICE)" +[[ $DICE != ?(-)+([0-9]) ]] && DICE=4 +# echo "$DICE WORDS SECRETS (Define length in $MY_PATH/DICE)" ## CHECK IF STYLE IS EMAIL => astro IPFS G1BILLET if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then - echo "ASTROPORT PLAYER DERIVATE KEY" + echo "ASTROPORT PLAYER OFFERED G1BILLET" # echo "PLAYER : $STYLE" EMAIL=${STYLE} - STYLE="astro" + STYLE="jeu" + DICE=3 fi ## STYLE SELECTED: PDF DE 6 BILLETS OR SINGLE NBbillets=6 [[ "${STYLE}" != "" && "${STYLE}" != "solian" && "${STYLE}" != "jeu" ]] && NBbillets=1 -echo "CREATION $NBbillets x G1BILLET - $STYLE -" +echo "CREATION $NBbillets x G1BILLET - $STYLE - " # CHECK IF $STYLE IMAGES EXIST [[ ! -f ${MY_PATH}/images/g1${STYLE}.png ]] && echo "AJOUTER : ./images/g1${STYLE}.jpg" && exit 1 [[ ! -f ${MY_PATH}/images/fond${STYLE}.jpg ]] && echo "STYLE INCONNU ? ./images/fond${STYLE}.jpg" && exit 1 [[ ! -f ${MY_PATH}/images/logo${STYLE}.png ]] && echo "AJOUTER : ./images/logo${STYLE}.jpg" && exit 1 -UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs) +UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) # CREATION DE $NBbillets BILLETS DE $MONTANT DU boucle=0; @@ -56,14 +57,14 @@ do ## ADAPT SECURITY LEVEL SALT=$(${MY_PATH}/diceware.sh $DICE | xargs) - [[ $EMAIL != "" ]] && SALT=$EMAIL - + #~ [[ $EMAIL != "" ]] && SALT="$EMAIL $SALT" SECRET=$(${MY_PATH}/diceware.sh $DICE | xargs) + #~ [[ $EMAIL != "" ]] && SECRET="$EMAIL $SECRET" # CREATION CLEF BILLET BILLETPUBKEY=$(python3 ${MY_PATH}/key_create_dunikey.py "$SALT" "$SECRET") rm -f /tmp/secret.dunikey - echo "$boucle : $BILLETPUBKEY" + echo "$boucle : $BILLETPUBKEY " ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SALT" "$SECRET" ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key) @@ -72,7 +73,7 @@ do ### GRAPHISM ##### # CREATION FICHIER IMAGE BILLET dans ${MY_PATH}/tmp/g1billet/${UNIQID} - $(${MY_PATH}/MAKE_G1BILLET.sh "${SALT}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONAUTENS}" "${EMAIL}") + ${MY_PATH}/MAKE_G1BILLET.sh "${SALT}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONAUTENS}" "${EMAIL}" done @@ -83,7 +84,7 @@ then cp ${MY_PATH}/tmp/g1billet/${UNIQID}/*.jpg ${MY_PATH}/tmp/g1billet/${UNIQID}.jpg # CLEANING TEMP FILES - rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID} + echo rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID} # ALLOWS ANY USER TO DELETE chmod 777 ${MY_PATH}/tmp/g1billet/${UNIQID}.jpg export ZFILE="${MY_PATH}/tmp/g1billet/${UNIQID}.jpg" @@ -93,6 +94,7 @@ else # MONTAGE DES IMAGES DES BILLETS VERS ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf montage ${MY_PATH}/tmp/g1billet/${UNIQID}/*.jpg -tile 2x3 -geometry 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf # NB!! if "not autorized" then edit /etc/ImageMagick-6/policy.xml and comment + [[ ! -s ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf ]] && echo "Please Correct PDF policy /etc/ImageMagick-6/policy.xml " && exit 1 # # CLEANING TEMP FILES rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID} @@ -157,7 +159,7 @@ Content-Type: text/html; charset=UTF-8 -

(♥‿‿♥).

+

(♥‿‿♥).