diff --git a/sms/ERASE.sh b/sms/ERASE.sh index e28cece..69e0962 100755 --- a/sms/ERASE.sh +++ b/sms/ERASE.sh @@ -12,26 +12,26 @@ echo "EXECUTE ERASE.sh ($1=xzuid)" xzuid="$1" [[ $xzuid == "" ]] && echo "NO $xzuid" && exit 1 -[[ ! -d ~/.zen/SMS/$xzuid ]] && echo "NO $xzuid" && exit 0 +[[ ! -d /home/pi/.zen/SMS/$xzuid ]] && echo "NO $xzuid" && exit 0 if [[ -f /var/www/nextcloud/occ ]]; then ######################################################################## echo "## DELETE Nextcloud : $xzuid " ######################################################################## - sudo su -s /bin/sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" + sudo su -s /bin/ba sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 fi -./natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/SMS/$xzuid/secret.dunikey.encrypt" -o "/tmp/erase.dunikey" +$MY_PATH/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/SMS/$xzuid/secret.dunikey.encrypt" -o "/tmp/erase.dunikey" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 -~/.zen/astrXbian/zen/jaklis/jaklis.py -k /tmp/erase.dunikey -n "https://data.gchange.fr" erase +$MY_PATH/jaklis/jaklis.py -k /tmp/erase.dunikey -n "https://data.gchange.fr" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 -~/.zen/astrXbian/zen/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://g1.data.e-is.pro" erase +$MY_PATH/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://g1.data.e-is.pro" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 -rm -Rf ~/.zen/SMS/$xzuid +rm -Rf /home/pi/.zen/SMS/$xzuid cd - diff --git a/sms/NEW.sh b/sms/NEW.sh index af7db3e..590f79a 100755 --- a/sms/NEW.sh +++ b/sms/NEW.sh @@ -6,7 +6,6 @@ ################################################################################ MY_PATH="`dirname \"$0\"`" # relative MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized -cd $MY_PATH ME="${0##*/}" echo "EXECUTE $ME ($1=phone, $2=uid)" @@ -15,47 +14,47 @@ EXTRA="$2" ######################################################################## echo "## GET COMPUTER G1PUB" ######################################################################## -[[ ! -f ~/.zen/secret.dunikey ]] && echo "Crypto is missing... please provide ~/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1 -G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) +[[ ! -f /home/pi/.zen/secret.dunikey ]] && echo "Crypto is missing... please provide /home/pi/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1 +G1PUB=$(cat /home/pi/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) echo $G1PUB ######################################################################## echo "## CREATE UNIQUE XZUID" ######################################################################## -XZUID=$(./diceware.sh 1 | xargs)${RANDOM:0:5} -while [[ -d ~/.zen/sms/$XZUID ]] +XZUID=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5} +while [[ -d /home/pi/.zen/sms/$XZUID ]] do - XZUID=$(./diceware.sh 1 | xargs)${RANDOM:0:5} + XZUID=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5} done -mkdir -p ~/.zen/SMS/$XZUID +mkdir -p /home/pi/.zen/SMS/$XZUID echo "$XZUID" ######################################################################## echo "## CREATE hash" # = sha256sum $phone ######################################################################## hash=$(echo $phone | sha256sum | cut -d ' ' -f1) -htest=$(ls ~/.zen/SMS/*/$hash 2>dev/null) +htest=$(ls /home/pi/.zen/SMS/*/$hash 2>dev/null) if [[ $htest ]]; then echo "$phone already regsitered in $htest" xzuid=$(echo "$htest" | rev | cut -d '/' -f 2 | rev) gammu-smsd-inject TEXT "$phone" -text "Salut $xzuid. identifiez-vous sur https://taurus.copylaradio.com utilisez votre numéro de mobile comme mot de passe." && exit 1 exit 1 fi -touch ~/.zen/SMS/$XZUID/$hash +touch /home/pi/.zen/SMS/$XZUID/$hash ######################################################################## -echo "## encrypt ~/.zen/SMS/$XZUID/phone.encrypt" +echo "## encrypt /home/pi/.zen/SMS/$XZUID/phone.encrypt" ######################################################################## echo $phone > /tmp/phone -./natools.py encrypt -p $G1PUB -i /tmp/phone -o ~/.zen/SMS/$XZUID/phone.encrypt +$MY_PATH/natools.py encrypt -p $G1PUB -i /tmp/phone -o /home/pi/.zen/SMS/$XZUID/phone.encrypt [[ ! $? == 0 ]] && echo "FAILED" && exit 1 echo "$hash" ######################################################################## echo "## CREATE secret.dunikey" ######################################################################## -salt="$(./diceware.sh 3 | xargs)" -pepper="$(./diceware.sh 3 | xargs)" -./key_create_dunikey.py "$salt" "$pepper" +salt="$($MY_PATH/diceware.sh 3 | xargs)" +pepper="$($MY_PATH/diceware.sh 3 | xargs)" +$MY_PATH/key_create_dunikey.py "$salt" "$pepper" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 g1pub=$(cat /tmp/secret.dunikey | grep "pub" | cut -d ' ' -f 2) g1sec=$(cat /tmp/secret.dunikey | grep "sec" | cut -d ' ' -f 2) @@ -69,25 +68,25 @@ qrencode -s 6 -o "$HOME/.zen/SMS/$XZUID/qrcode.png" "$g1pub" ######################################################################## echo "## encrypt secret.dunikey.encrypt" ######################################################################## -./natools.py encrypt -p $G1PUB -i /tmp/secret.dunikey -o ~/.zen/SMS/$XZUID/secret.dunikey.encrypt +$MY_PATH/natools.py encrypt -p $G1PUB -i /tmp/secret.dunikey -o /home/pi/.zen/SMS/$XZUID/secret.dunikey.encrypt [[ ! $? == 0 ]] && echo "FAILED" && exit 1 ######################################################################## echo "GETTING AVATAR" ######################################################################## -curl -s https://thispersondoesnotexist.com/image -o ~/.zen/SMS/$XZUID/image.jpg +curl -s https://thispersondoesnotexist.com/image -o /home/pi/.zen/SMS/$XZUID/image.jpg ######################################################################## echo "CREATING GCHANGE+ PROFILE" ######################################################################## -./jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://data.gchange.fr" set --name "$XZUID" --avatar "$HOME/.zen/SMS/$XZUID/image.jpg" #GCHANGE+ +$MY_PATH/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://data.gchange.fr" set --name "$XZUID" --avatar "$HOME/.zen/SMS/$XZUID/image.jpg" #GCHANGE+ [[ ! $? == 0 ]] && echo "FAILED" && exit 1 ######################################################################## echo "CREATING CESIUM+ PROFILE" ######################################################################## -./jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "$HOME/.zen/SMS/$XZUID/image.jpg" #CESIUM+ +$MY_PATH/jaklis/jaklis.py -k /tmp/secret.dunikey -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "$HOME/.zen/SMS/$XZUID/image.jpg" #CESIUM+ [[ ! $? == 0 ]] && echo "FAILED" && exit 1 if [[ -f /var/www/nextcloud/occ ]]; then @@ -133,5 +132,5 @@ if [[ -f /tmp/sms ]]; then final=$(cat /tmp/sms | tail -c+160 | tail -c+160) [[ $final ]] && sleep 3 && gammu-smsd-inject TEXT "$phone" -text "$(cat /tmp/sms | tail -c+160 | tail -c+160)" fi -cd - + exit 0 diff --git a/sms_received.sh b/sms_received.sh index 0cbf3d9..0c6a35b 100755 --- a/sms_received.sh +++ b/sms_received.sh @@ -4,12 +4,15 @@ # Version: 0.1 # License: GPL (http://www.google.com/search?q=GPL) ######################################################################## +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized + prefix="+33" ######################################################################## # GET SMSADMIN PHONE NUMBER FROM ~/.zen/SMSADMIN FILE ######################################################################## -[[ ! -f ~/.zen/SMSADMIN ]] && echo "EXIT. Indiquez votre numéro de mobile dans ~/.zen/SMSADMIN" && mkdir -p ~/.zen && touch ~/.zen/SMSADMIN && exit 1 +[[ ! -f /etc/SMSADMIN ]] && echo "EXIT. Indiquez votre numéro de mobile dans /etc/SMSADMIN" && exit 1 SMSADMIN="$(cat ~/.zen/SMSADMIN)" ## FRENCH NUMBER smsadmin=0${SMSADMIN#"$prefix"} ## 06 @@ -42,12 +45,12 @@ echo "COMMAND = $CMD" case "$CMD" in A|AIDE) ## ASK FOR HELP - ./sms/AIDE.sh "$phone" & + $MY_PATH/sms/AIDE.sh "$phone" & ;; O|OPEN|OASIS) ## CREATE ACCOUNT EXTRA=$(echo "$TEXT" | awk '{print $2}' | grep -E "([A-Za-z0-9\-\_]+$)") - ./sms/NEW.sh "$phone" "$EXTRA" & + $MY_PATH/sms/NEW.sh "$phone" "$EXTRA" & ;; *) echo "EXIT. COMMANDE INCONNUE : $CMD" && exit 1