jrgnuproject
/
jaklis
forked from axiom-team/jaklis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add OPTIONS request before POST; Add options -o for outbox in deletemsg.sh

This commit is contained in:
poka 2020-11-05 04:09:22 +01:00
parent 92fdf87b3a
commit 4296a5ada6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deletemsg.sh
View File

@ -16,6 +16,7 @@ do
case ${args[$i]} in
-t|--test) file="test.txt"
recipient=$issuer;;
-o|--outbox) type=outbox;;
-id|--id) id="${args[$i+1]}"
[[ -z $id ]] && echo "Veuillez préciser un ID de message." && exit 1;;
-i|--issuer) issuer="${args[$i+1]}"
@ -25,6 +26,9 @@ do
esac
done
if [[ -z $type ]]; then
type="inbox"
fi
if [[ -z $id ]]; then
read -p "ID de message: " ID
fi
@ -40,7 +44,7 @@ fi
times=$(date -u +'%s')
# Fabrication du hash
hash="{\"version\":2,\"index\":\"message\",\"type\":\"inbox\",\"id\":\"$id\",\"issuer\":\"$issuer\",\"time\":$times}"
hash="{\"version\":2,\"index\":\"message\",\"type\":\"$type\",\"id\":\"$id\",\"issuer\":\"$issuer\",\"time\":$times}"
hash=$(echo -n "$hash" | sha256sum | cut -d ' ' -f1 | awk '{ print toupper($0) }')
# Fabrication de la signature
@ -50,7 +54,7 @@ signature=$(echo -n "$hash" | ./natools.py sign -f pubsec -k $dunikey --noinc -O
echo "{
\"version\": 2,
\"index\": \"message\",
\"type\": \"inbox\",
\"type\": \"$type\",
\"id\": \"$id\",
\"issuer\": \"$issuer\",
\"time\": $times,
@ -59,4 +63,4 @@ echo "{
}"
# Envoi du document
curl -X POST "$pod/history/delete" -d "{\"version\":2,\"index\":\"message\",\"type\":\"inbox\",\"id\":\"$id\",\"issuer\":\"$issuer\",\"time\":$times,\"hash\":\"$hash\",\"signature\":\"$signature\"}"
curl -X POST "$pod/history/delete" -d "{\"version\":2,\"index\":\"message\",\"type\":\"$type\",\"id\":\"$id\",\"issuer\":\"$issuer\",\"time\":$times,\"hash\":\"$hash\",\"signature\":\"$signature\"}"

9
sendmsg.sh
View File

@ -93,4 +93,11 @@ echo "{
}"
# Envoi du document
curl -X POST "$pod/message/inbox" -d "{\"issuer\":\"$issuer\",\"recipient\":\"$recipient\",\"title\":\"$title\",\"content\":\"$content\",\"time\":$times,\"nonce\":\"$nonce\",\"version\":2,\"hash\":\"$hash\",\"signature\":\"$signature\"}"
curl -X OPTIONS "$pod/message/inbox?pubkey=$issuer" -d "pubkey=$issuer"
curl -X POST "$pod/message/inbox?pubkey=$issuer" -d "{\"hash\":\"$hash\",\"signature\":\"$signature\",\"issuer\":\"$issuer\",\"recipient\":\"$recipient\",\"title\":\"$title\",\"content\":\"$content\",\"time\":$times,\"nonce\":\"$nonce\",\"version\":2}"
# curl -X OPTIONS "$pod/message/outbox?pubkey=$issuer" -d "pubkey=$issuer"
# curl -X POST "$pod/message/outbox?pubkey=$issuer" -d "{\"hash\":\"$hash\",\"signature\":\"$signature\",\"issuer\":\"$issuer\",\"recipient\":\"$recipient\",\"title\":\"$title\",\"content\":\"$content\",\"time\":$times,\"nonce\":\"$nonce\",\"version\":2}"
# To put the message as read
# ,\"read_signature\":\"$signature\"