diff --git a/API/QRCODE.sh b/API/QRCODE.sh index d97c642b..50eb6cce 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -61,10 +61,10 @@ $MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCOD ################################################################################################### # THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 -### amzqr "$myASTROPORT/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ -### amzqr "$myASTROPORT/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ +### amzqr "$myASTROPORT/?qrcode=$G1PUB&junesec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ +### amzqr "$myASTROPORT/?qrcode=$WISHKEY&junesec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ ### -if [[ $AND == "sslpassdunikeysec" ]]; then +if [[ $AND == "junesec" ]]; then echo "♥BOX♥BOX♥BOX♥BOX♥BOX" echo "MAGIC WORLD ASTRONAUT & WISHES" diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh index bd274374..c4ffcebe 100755 --- a/ASTROBOT/G1Voeu.sh +++ b/ASTROBOT/G1Voeu.sh @@ -93,9 +93,9 @@ mkdir -p ~/.zen/tmp/$MOATS ## LE MOT DE PASSE DU PLAYER PEUT DECOUVRIR LE SECRET ( ## SEC PASS PROTECTED QRCODE : base58 secFromDunikey.openssl(pass) secFromDunikey=$(cat ~/.zen/tmp/qrtw.dunikey | grep "sec" | cut -d ' ' -f2) - echo "$secFromDunikey" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec + echo "SALT=\"$SALT\"; PEPPER=\"$PEPPER\"" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in ~/.zen/tmp/${MOATS}/${PSEUDO}.sec -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k "$SALT" 2>/dev/null - PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base58) + PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base64 -w 0 | jq -sRr '@uri' ) HPass=$(echo "$SALT" | sha512sum | cut -d ' ' -f 1 ) qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec @@ -104,7 +104,7 @@ mkdir -p ~/.zen/tmp/$MOATS convert -gravity southeast -pointsize 25 -fill black -draw "text 30,30 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png ## MAKE amzqr WITH astro:// LINK - amzqr "$myASTRONEF/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ + amzqr "$myASTRONEF/?qrcode=$WISHKEY&junesec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \ -d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \ -l H \ -p ~/.zen/tmp/${MOATS}/result.png -c @@ -181,7 +181,7 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE "text": "'${TEXT}'", "tags": "'G1Voeu G1${PEPPER} ${PLAYER}'", "asksalt": "'${HPass}'", - "sslpassdunikeysec" : "'${ENCODING}'" + "junesec" : "'${ENCODING}'" } ] ' > ~/.zen/game/world/$PEPPER/$WISHKEY/${PEPPER}.voeu.json diff --git a/ajouter_media.sh b/ajouter_media.sh index af4c749a..857b96b4 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -253,6 +253,7 @@ mkdir -p ${YTEMP} echo "VIDEO $YTURL" LINE="$(yt-dlp $BROWSER --print "%(id)s&%(title)s" "${YTURL}")" +echo $LINE YID=$(echo "$LINE" | cut -d '&' -f 1) TITLE=$(echo "$LINE" | cut -d '&' -f 2- | detox --inline) @@ -263,11 +264,18 @@ TITLE=$(echo "$LINE" | cut -d '&' -f 2- | detox --inline) -S res,ext:mp4:m4a --recode mp4 --no-mtime --embed-thumbnail --add-metadata \ -o "${YTEMP}/$TITLE.%(ext)s" "$YTURL" - if [[ ! $(ls "${YTEMP}/*.mp4") ]]; then + DFILE=$(ls ${YTEMP}/*.mp4) + echo "LISTING ${YTEMP} : $DFILE" + + if [[ $DFILE == "" ]]; then ## SECOND TRY /usr/local/bin/youtube-dl --no-playlist $BROWSER --download-archive $HOME/.zen/.yt-dlp.list -S res,ext:mp4:m4a --no-mtime --embed-thumbnail --add-metadata -o "${YTEMP}/$TITLE.%(ext)s" "$YTURL" fi - [[ ! $(ls "${YTEMP}/*.mp4") ]] && espeak "cannot download file" && exit 1 + + DFILE=$(ls ${YTEMP}/*.mp4) + echo "LISTING ${YTEMP} : $DFILE" + + [[ $DFILE == "" ]] && espeak "cannot find file" && exit 1 ZFILE="$TITLE.mp4" echo "$ZFILE" diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 26cc0a79..cbbdb732 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -194,11 +194,11 @@ DISCO="https://astroport.$(myHostName)/?salt=${USALT}&pepper=${UPEPPER}&logout=$ qrencode -s 12 -o ~/.zen/game/players/${PLAYER}/QR.ASTRONAUTENS.png "$LIBRA/ipns/${ASTRONAUTENS}" - ## SEC PASS PROTECTED QRCODE : base58 secFromDunikey.openssl(pass) - secFromDunikey=$(cat ~/.zen/game/players/${PLAYER}/secret.dunikey | grep "sec" | cut -d ' ' -f2) - echo "$secFromDunikey" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec - openssl enc -aes-256-cbc -salt -in ~/.zen/tmp/${MOATS}/${PSEUDO}.sec -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k $PASS 2>/dev/null - PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base58) + ## SEC PASS PROTECTED QRCODE : base58 secret.june / openssl(pass) + #~ secFromDunikey=$(cat ~/.zen/game/players/${PLAYER}/secret.dunikey | grep "sec" | cut -d ' ' -f2) + #~ echo "$secFromDunikey" > ~/.zen/tmp/${MOATS}/${PSEUDO}.sec + openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in ~/.zen/game/players/${PLAYER}/secret.june -out "$HOME/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec" -k "$PASS" 2>/dev/null + PASsec=$(cat ~/.zen/tmp/${MOATS}/enc.${PSEUDO}.sec | base64 -w 0 | jq -sRr '@uri' ) HPass=$(echo "$PASS" | sha512sum | cut -d ' ' -f 1) qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec @@ -208,7 +208,7 @@ DISCO="https://astroport.$(myHostName)/?salt=${USALT}&pepper=${UPEPPER}&logout=$ ## convert -gravity southeast -pointsize 50 -fill black -draw "text 40,40 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png ## MAKE amzqr WITH astro:// LINK - amzqr "$myASTRONEF/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ + amzqr "$myASTRONEF/?qrcode=$G1PUB&junesec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \ -d $HOME/.zen/game/players/${PLAYER} \ -l H \ -p ~/.zen/tmp/${MOATS}/result.png @@ -428,7 +428,7 @@ ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current # PASS CRYPTING KEY #~ echo; echo "Sécurisation de vos clefs... "; sleep 1 -openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.june" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.june" -k $PASS 2>/dev/null +openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.june" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.june" -k "$PASS" 2>/dev/null #~ openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/secret.dunikey" -out "$HOME/.zen/game/players/${PLAYER}/enc.secret.dunikey" -k $PASS 2>/dev/null #~ openssl enc -aes-256-cbc -md sha512 -pbkdf2 -iter 100000 -salt -in "$HOME/.zen/game/players/${PLAYER}/$KEYFILE -out" "$HOME/.zen/game/players/${PLAYER}/enc.$KEYFILE" -k $PASS 2>/dev/null ## TODO MORE SECURE ?! USE opengpg, natools, etc ... diff --git a/www/AESBox/index.html b/www/AESBox/index.html index a561e8db..64d291cf 100644 --- a/www/AESBox/index.html +++ b/www/AESBox/index.html @@ -2,7 +2,7 @@ CryptoJS Decryption - +

CryptoJS Decryption

@@ -24,7 +24,7 @@ console.log(cryptText); console.log(decryptedWA.toString(CryptoJS.enc.Utf8)); - //Decode from text + //Decode from text var cipherParams = CryptoJS.lib.CipherParams.create({ ciphertext: CryptoJS.enc.Base64.parse(cryptText ) }); diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index 141821f0..138bc069 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -52,100 +52,4 @@ - +