diff --git a/12345.sh b/12345.sh index a2eeeefb..2f9b6f00 100755 --- a/12345.sh +++ b/12345.sh @@ -194,7 +194,7 @@ while true; do ;; "qrcode") - exec ${MY_PATH}/API/QRCODE.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" "${MOATS}" & + exec ${MY_PATH}/API/QRCODE.sh "$PORT" "$THAT" "$AND" "$THIS" "$APPNAME" "$WHAT" "$OBJ" "$VAL" "${MOATS}" "$COOKIE" & ;; "") diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 3441a22d..9fa2bd4a 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -12,11 +12,13 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized start=`date +%s` -PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 +PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 COOKIE=$10 ### transfer variables according to script QRCODE=$THAT TYPE=$WHAT +echo "COOKIE : $COOKIE" + HTTPCORS="HTTP/1.1 200 OK Access-Control-Allow-Origin: ${myASTROPORT} Access-Control-Allow-Credentials: true @@ -25,6 +27,7 @@ Server: Astroport.ONE Content-Type: text/html; charset=UTF-8 " +function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } ## GET TW mkdir -p ~/.zen/tmp/${MOATS}/ @@ -63,12 +66,26 @@ fi ################################################################################ ## MODE PGP ENCRYPTED QRCODE +# http://127.0.0.1:1234/?qrcode=-----BEGIN%20PGP%20MESSAGE-----~~jA0ECQMCWZ%2BOT%2FstJiz%2B0koBBzdybjOYmFHlYSdta6YsO4VMPC%2BEL1tinYpWdIh1~q%2FIZGCu3ZXUK%2FfDmYED%2BKh0vzAJ%2ByBOjSAGaAFfigZYrAhNAPDP8jzZ14w%3D%3D~%3DN1Dz~-----END%20PGP%20MESSAGE-----~&pass=coucou ################################################################################ if [[ ${QRCODE:0:5} == "-----" ]]; then - echo "## THIS IS A PGP ENCRYPTED QRCODE ASK FOR PASSWORD" echo ${QRCODE} - echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect - sed "s~encrypted pgp data here~${QRCODE}~g" $MY_PATH/../www/AESBox/index.htm >> ~/.zen/tmp/${MOATS}/index.redirect + PASS=$(urldecode $THIS) + echo "## THIS IS A PGP ENCRYPTED QRCODE LOOK - PASS $PASS -" + + if [[ $PASS != "" ]]; then + urldecode ${QRCODE} | tr '~' '\n' | tr '_' '+' > ~/.zen/tmp/${MOATS}/disco.aes + sed -i '$ d' ~/.zen/tmp/${MOATS}/disco.aes + echo ~/.zen/tmp/${MOATS}/disco.aes + cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "$PASS" --batch > ~/.zen/tmp/${MOATS}/disco + echo "DISCO" + cat ~/.zen/tmp/${MOATS}/disco + else + echo "PASS MISSING" > ~/.zen/tmp/${MOATS}/disco + fi + + echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect + cat ~/.zen/tmp/${MOATS}/disco >> ~/.zen/tmp/${MOATS}/index.redirect ( cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS} diff --git a/API/SALT.sh b/API/SALT.sh index ba7be012..51736133 100755 --- a/API/SALT.sh +++ b/API/SALT.sh @@ -448,9 +448,12 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh || REPLACE=${myIPFS}/ipns/${ASTRONAUTENS} ## SET COOKIE + USALT=$(echo "$SALT" | jq -Rr @uri) + UPEPPER=$(echo "$PEPPER" | jq -Rr @uri) + echo "/?salt=${USALT}&pepper=${UPEPPER}" sed "s~_TWLINK_~${REPLACE}~g" ~/.zen/Astroport.ONE/templates/index.302 > ~/.zen/tmp/coucou/${MOATS}.index.redirect - sed -i "s~_G1PUB_~${G1PUB}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect - sed -i "s~_ASTRONAUTENS_~${ASTRONAUTENS}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect + sed -i "s~_USALT_~${G1PUB}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect + sed -i "s~_UPEPPER_~${ASTRONAUTENS}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect echo "url='"${REPLACE}"'" >> ~/.zen/tmp/coucou/${MOATS}.index.redirect cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & diff --git a/templates/index.302 b/templates/index.302 index 20dfcef3..53bb9c49 100644 --- a/templates/index.302 +++ b/templates/index.302 @@ -3,6 +3,6 @@ Access-Control-Allow-Origin: * Access-Control-Allow-Credentials: true Access-Control-Allow-Methods: GET Content-Type: text/html; charset=UTF-8 -Set-Cookie: userId=_G1PUB_ ipnsId=_ASTRONAUTENS_ +Set-Cookie: /?salt=_USALT_&pepper=_UPEPPER_ Location: _TWLINK_ diff --git a/templates/register.html b/templates/register.html index 5234f9f3..87f2ae2b 100644 --- a/templates/register.html +++ b/templates/register.html @@ -200,6 +200,9 @@ function testLatency(cb) {