## Fill LNK - Tiddler - escape \&

This commit is contained in:
fred 2024-02-22 23:17:07 +01:00
parent c15bb02b10
commit 0b2870f3b9
3 changed files with 357 additions and 352 deletions

View File

@ -26,34 +26,38 @@ Content-Type: text/html; charset=UTF-8
" "
mkdir -p ~/.zen/tmp/${MOATS}/ mkdir -p ~/.zen/tmp/${MOATS}/
[[ ! $APPNAME || $SALT == "pepper" ]] && echo "NO APPNAME - BAD APP - CONTINUE" && (echo "$HTTPCORS ERROR - BAD CREDENTIALS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 [[ ! $APPNAME || $SALT == "pepper" ]] \
############################################################################ && echo "NO APPNAME - BAD APP - CONTINUE" \
# WRITING API # SALT # PEPPER # MAKING THE KEY EXIST ######### && (echo "$HTTPCORS ERROR - BAD CREDENTIALS" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) \
################### KEY GEN ################################### && exit 1
echo ">>>>>>>>>>>>>> Application LaBureautique >><< APPNAME = $APPNAME <<<<<<<<<<<<<<<<<<<<"
[[ ! $SALT ]] && (echo "$HTTPCORS ERROR - SALT MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 ############################################################################
[[ ! $PEPPER || ${PEPPER:0:2} == "G1" ]] && (echo "$HTTPCORS ERROR - BAD OR PEPPER MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1 # WRITING API # SALT # PEPPER # MAKING THE KEY EXIST #########
################### KEY GEN ###################################
echo ">>>>>>>>>>>>>> Application LaBureautique >><< APPNAME = $APPNAME <<<<<<<<<<<<<<<<<<<<"
## SAVE "salt" "pepper" DEBUG REMOVE OR PASS ENCRYPT FOR SECURITY REASON [[ ! $SALT ]] && (echo "$HTTPCORS ERROR - SALT MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "PLAYER : \"$SALT\" \"$PEPPER\" : $APPNAME ($WHAT)" [[ ! $PEPPER || ${PEPPER:0:2} == "G1" ]] && (echo "$HTTPCORS ERROR - BAD OR PEPPER MISSING" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "\"$SALT\" \"$PEPPER\"" > ~/.zen/tmp/${MOATS}/${MOATS}.secret.june
# CALCULATING ${MOATS}.secret.key + G1PUB ## SAVE "salt" "pepper" DEBUG REMOVE OR PASS ENCRYPT FOR SECURITY REASON
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/${MOATS}.secret.key "$SALT" "$PEPPER" echo "PLAYER : \"$SALT\" \"$PEPPER\" : $APPNAME ($WHAT)"
G1PUB=$(cat ~/.zen/tmp/${MOATS}/${MOATS}.secret.key | grep 'pub:' | cut -d ' ' -f 2) echo "\"$SALT\" \"$PEPPER\"" > ~/.zen/tmp/${MOATS}/${MOATS}.secret.june
[[ ! ${G1PUB} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - KEYGEN COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "G1PUB : ${G1PUB}"
## CALCULATING ${MOATS}.${G1PUB}.ipns.key ADDRESS # CALCULATING ${MOATS}.secret.key + G1PUB
ipfs key rm ${G1PUB} > /dev/null 2>&1 ${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/${MOATS}.secret.key "$SALT" "$PEPPER"
rm -f ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key G1PUB=$(cat ~/.zen/tmp/${MOATS}/${MOATS}.secret.key | grep 'pub:' | cut -d ' ' -f 2)
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key "$SALT" "$PEPPER" [[ ! ${G1PUB} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - KEYGEN COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
ASTRONAUTENS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key ) echo "G1PUB : ${G1PUB}"
[[ ! ${ASTRONAUTENS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - ASTRONAUTENS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "TW ADDRESS : $myIPFS/ipns/${ASTRONAUTENS}" ## CALCULATING ${MOATS}.${G1PUB}.ipns.key ADDRESS
echo ipfs key rm ${G1PUB} > /dev/null 2>&1
rm -f ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key "$SALT" "$PEPPER"
ASTRONAUTENS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${MOATS}.${G1PUB}.ipns.key )
[[ ! ${ASTRONAUTENS} ]] && (echo "$HTTPCORS ERROR - (╥☁╥ ) - ASTRONAUTENS COMPUTATION DISFUNCTON" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && exit 1
echo "TW ADDRESS : $myIPFS/ipns/${ASTRONAUTENS}"
echo
######################################## ########################################
## APPNAME SELECTION ######################## ## APPNAME SELECTION ########################
@ -62,7 +66,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/
############################################## ##############################################
# MESSAGING : GET MESSAGE FROM GCHANGE+ # MESSAGING : GET MESSAGE FROM GCHANGE+
############################################## ##############################################
if [[ $APPNAME == "messaging" ]]; then if [[ $APPNAME == "messaging" ]]; then
( ## & SUB PROCESS ( ## & SUB PROCESS
@ -105,13 +109,13 @@ mkdir -p ~/.zen/tmp/${MOATS}/
end=`date +%s` end=`date +%s`
echo " Messaging launch (☓‿‿☓) Execution time was "`expr $end - $start` seconds. echo " Messaging launch (☓‿‿☓) Execution time was "`expr $end - $start` seconds.
exit 0 exit 0
fi fi
######################## MESSAGING END ######################## MESSAGING END
######################################## ########################################
# G1PUB : REDIRECT TO GCHANGE OR TW + EMAIL => CREATE PLAYER ! # G1PUB : REDIRECT TO GCHANGE OR TW + EMAIL => CREATE PLAYER !
######################################## ########################################
if [[ "$APPNAME" == "g1pub" ]]; then if [[ "$APPNAME" == "g1pub" ]]; then
if [[ "$OBJ" != "email" ]]; then if [[ "$OBJ" != "email" ]]; then
## WITH NO EMAIL -> Open Gchange Profile & Update TW cache ## WITH NO EMAIL -> Open Gchange Profile & Update TW cache
@ -210,7 +214,7 @@ mkdir -p ~/.zen/tmp/${MOATS}/
fi fi
fi fi
######################################## ########################################
######################################## ########################################
@ -218,9 +222,9 @@ mkdir -p ~/.zen/tmp/${MOATS}/
#TESTCRAFT=ON nodeid dataid #TESTCRAFT=ON nodeid dataid
######################################## ########################################
######################################## ########################################
if [[ "$APPNAME" == "testcraft" ]]; then if [[ "$APPNAME" == "testcraft" ]]; then
( # testcraft & SUB PROCESS ( # testcraft & SUB PROCESS
start=`date +%s` start=`date +%s`
## RECORD DATA MADE IN BROWSER (JSON) ## RECORD DATA MADE IN BROWSER (JSON)
@ -328,18 +332,18 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
echo ${MOATS}:${G1PUB}:${PLAYER}:${APPNAME}:$dur >> ~/.zen/tmp/${IPFSNODEID}/_timings echo ${MOATS}:${G1PUB}:${PLAYER}:${APPNAME}:$dur >> ~/.zen/tmp/${IPFSNODEID}/_timings
cat ~/.zen/tmp/${IPFSNODEID}/_timings | tail -n 1 cat ~/.zen/tmp/${IPFSNODEID}/_timings | tail -n 1
) & # testcraft & SUB PROCESS ) & # testcraft & SUB PROCESS
end=`date +%s` end=`date +%s`
echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds. echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds.
exit 0 exit 0
fi fi
############################################## ##############################################
# PAY : /?salt=SALT&pepper=PEPPER&pay=1&dest=G1PUB APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 # PAY : /?salt=SALT&pepper=PEPPER&pay=1&dest=G1PUB APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9
############################################## ##############################################
if [[ $APPNAME == "pay" ]]; then if [[ $APPNAME == "pay" ]]; then
( (
echo "$HTTPCORS" > ~/.zen/tmp/$PLAYER.pay.$WHAT.http echo "$HTTPCORS" > ~/.zen/tmp/$PLAYER.pay.$WHAT.http
if [[ $WHAT =~ ^[0-9]+$ ]]; then if [[ $WHAT =~ ^[0-9]+$ ]]; then
@ -372,13 +376,13 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
end=`date +%s` end=`date +%s`
echo "(G_G ) G1BANK Operation time was "`expr $end - $start` seconds. echo "(G_G ) G1BANK Operation time was "`expr $end - $start` seconds.
exit 0 exit 0
) & ) &
fi fi
############################################## ##############################################
# FRIEND ★ &friend=G1PUB&stars=1 // APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 # FRIEND ★ &friend=G1PUB&stars=1 // APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9
############################################## ##############################################
if [[ $APPNAME == "friend" ]]; then if [[ $APPNAME == "friend" ]]; then
## CHECK IF ASKING FRIEND TW EXISTS ## CHECK IF ASKING FRIEND TW EXISTS
#~ ipfs --timeout 60s ls /ipns/${ASTRONAUTENS} #~ ipfs --timeout 60s ls /ipns/${ASTRONAUTENS}
@ -397,25 +401,25 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
end=`date +%s` end=`date +%s`
echo $APPNAME "(☉_☉ ) ${MESTAR} Execution time was "`expr $end - $start` seconds. echo $APPNAME "(☉_☉ ) ${MESTAR} Execution time was "`expr $end - $start` seconds.
exit 0 exit 0
fi fi
############################################## ##############################################
# GETIPNS # GETIPNS
############################################## ##############################################
if [[ $APPNAME == "getipns" ]]; then if [[ $APPNAME == "getipns" ]]; then
( echo "$HTTPCORS ( echo "$HTTPCORS
url='"${ASTRONAUTENS}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) & url='"${ASTRONAUTENS}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getipns : ${ASTRONAUTENS}" ) &
end=`date +%s` end=`date +%s`
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
rm ~/.zen/tmp/${MOATS}/${MOATS}.* rm ~/.zen/tmp/${MOATS}/${MOATS}.*
exit 0 exit 0
fi fi
############################################## ##############################################
# GETG1PUB # GETG1PUB
############################################## ##############################################
if [[ $APPNAME == "getg1pub" ]]; then if [[ $APPNAME == "getg1pub" ]]; then
( (
echo "$HTTPCORS echo "$HTTPCORS
url='"${G1PUB}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}" url='"${G1PUB}"'" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 && echo "SLURP getg1pub : ${G1PUB}"
@ -425,12 +429,12 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds. echo $APPNAME "(☉_☉ ) /ipns/${ASTRONAUTENS} Execution time was "`expr $end - $start` seconds.
rm ~/.zen/tmp/${MOATS}/${MOATS}* rm ~/.zen/tmp/${MOATS}/${MOATS}*
exit 0 exit 0
fi fi
############################################## ##############################################
# LOGIN # LOGIN
############################################## ##############################################
if [[ $APPNAME == "login" ]]; then if [[ $APPNAME == "login" ]]; then
## INSTALL PLAYER IPNS KEY ON STATION ## INSTALL PLAYER IPNS KEY ON STATION
[[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \ [[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
@ -464,12 +468,12 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds. echo $APPNAME "(☉_☉ ) Execution time was "`expr $end - $start` seconds.
exit 0 exit 0
fi fi
############################################## ##############################################
# LOGOUT # LOGOUT
############################################## ##############################################
if [[ $APPNAME == "logout" ]]; then if [[ $APPNAME == "logout" ]]; then
## REMOVE PLAYER IPNS KEY FROM STATION ## REMOVE PLAYER IPNS KEY FROM STATION
[[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \ [[ "${SALT}" =~ ^[a-zA-Z0-9.%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]] \
@ -487,22 +491,25 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
rm ~/.zen/tmp/${MOATS}/${MOATS}.* rm ~/.zen/tmp/${MOATS}/${MOATS}.*
exit 0 exit 0
fi fi
################################################################################################### ###################################################################################################
################################################################################################### ###################################################################################################
## END RESPONDING ## END RESPONDING
[[ ! -s ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ]] && echo "$HTTPCORS PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 url=/user/$G1PUB" > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect [[ ! -s ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect ]] \
cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/${MOATS}/${MOATS}.official.swallow & && echo "$HTTPCORS PORT=$1 THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8 MOATS=$9 url=/user/$G1PUB" \
echo "HTTP 1.1 PROTOCOL DOCUMENT READY" > ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect
echo "${MOATS} -----> PAGE AVAILABLE -----> http://${myHOST}:${PORT}"
end=`date +%s` cat ~/.zen/tmp/${MOATS}/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/${MOATS}/${MOATS}.official.swallow &
echo $type" (J‿‿J) Execution time was "`expr $end - $start` seconds. echo "HTTP 1.1 PROTOCOL DOCUMENT READY"
rm ~/.zen/tmp/${MOATS}/${MOATS}.* echo "${MOATS} -----> PAGE AVAILABLE -----> http://${myHOST}:${PORT}"
end=`date +%s`
echo $type" (J‿‿J) Execution time was "`expr $end - $start` seconds.
rm ~/.zen/tmp/${MOATS}/${MOATS}.*
exit 0 exit 0

View File

@ -59,9 +59,7 @@ for PLAYER in ${PLAYERONE[@]}; do
echo "+++ WALLET BALANCE _ $COINS (G1) _ / $ZEN ZEN /" echo "+++ WALLET BALANCE _ $COINS (G1) _ / $ZEN ZEN /"
#~ ## ZENCARD ARE ACTIVATED WITH 1 G1 + 10 ZEN (= 1 €OC) ? #~ ## ZENCARD ARE ACTIVATED WITH 1 G1 + 10 ZEN (= 1 €OC) ?
echo "##################################################################" echo "##>>>>>>>>>>>>>>>> REFRESH ASTRONAUTE TW"
echo "################### REFRESH ASTRONAUTE TW ###########################"
echo "##################################################################"
## REFRESH ASTRONAUTE TW ## REFRESH ASTRONAUTE TW
ASTRONAUTENS=$(ipfs key list -l | grep -w ${G1PUB} | cut -d ' ' -f1) ASTRONAUTENS=$(ipfs key list -l | grep -w ${G1PUB} | cut -d ' ' -f1)
@ -214,7 +212,7 @@ for PLAYER in ${PLAYERONE[@]}; do
[[ $(echo "$COINS >= 2" | bc -l) -eq 1 ]] \ [[ $(echo "$COINS >= 2" | bc -l) -eq 1 ]] \
&& echo "## Connect_PLAYER_To_Gchange.sh" \ && echo "## Connect_PLAYER_To_Gchange.sh" \
&& ${MY_PATH}/../tools/Connect_PLAYER_To_Gchange.sh "${PLAYER}" \ && ${MY_PATH}/../tools/Connect_PLAYER_To_Gchange.sh "${PLAYER}" \
|| echo "1 G1 + 10 ẑen needed to activate ★★★★★ system" || echo "$COINS <= 1 G1 + 10 ẑen : stars exchange (★★★★★) level"
# G1PalPay - 1 G1 mini -> Check for G1 TX incoming comments # # G1PalPay - 1 G1 mini -> Check for G1 TX incoming comments #
if [[ $(echo "$COINS >= 1" | bc -l) -eq 1 ]]; then if [[ $(echo "$COINS >= 1" | bc -l) -eq 1 ]]; then

View File

@ -256,8 +256,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
## RESET WISHES TO DEPLOY DERIVATED KEYS ON HOST AGAIN ( DONE IN PLAYER_REFRESH ) ## RESET WISHES TO DEPLOY DERIVATED KEYS ON HOST AGAIN ( DONE IN PLAYER_REFRESH )
#~ sed -i "s~G1Voeu~voeu~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html #~ sed -i "s~G1Voeu~voeu~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
## Fill ♥BOX - CopierYoutube Tiddler ## Fill LNK - Tiddler - escape \&
sed -i "s~_URL_~${URL}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html sed -i "s~_URL_~$(echo "${URL}" | sed 's/[&/]/\\&/g')~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html
# INSERT PLAYER DATA # INSERT PLAYER DATA
sed -i "s~_PLAYER_~${PLAYER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html sed -i "s~_PLAYER_~${PLAYER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html