mirror of
https://github.com/BetterCorp/BetterFrame.git
synced 2026-05-26 20:16:35 +00:00
fix: single curl call for pairing claim to prevent credential wipe
This commit is contained in:
parent
44e4b7f3af
commit
d9a2947001
1 changed files with 9 additions and 10 deletions
|
|
@ -85,25 +85,23 @@ pair_with_server() {
|
||||||
|
|
||||||
# Poll until admin confirms
|
# Poll until admin confirms
|
||||||
echo "Waiting for admin to confirm..."
|
echo "Waiting for admin to confirm..."
|
||||||
|
local tmpfile
|
||||||
|
tmpfile=$(mktemp)
|
||||||
while true; do
|
while true; do
|
||||||
local claim
|
local http_code
|
||||||
claim=$(curl -s -o /dev/null -w "%{http_code}" -X POST "${server}/api/pair/claim" \
|
http_code=$(curl -s -w "%{http_code}" -o "$tmpfile" -X POST "${server}/api/pair/claim" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"code\":\"${code}\"}" 2>/dev/null || echo "000")
|
-d "{\"code\":\"${code}\"}" 2>/dev/null || echo "000")
|
||||||
|
|
||||||
if [[ "$claim" == "200" ]]; then
|
if [[ "$http_code" == "200" ]]; then
|
||||||
local claim_resp
|
|
||||||
claim_resp=$(curl -sf -X POST "${server}/api/pair/claim" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "{\"code\":\"${code}\"}")
|
|
||||||
|
|
||||||
local kiosk_key
|
local kiosk_key
|
||||||
kiosk_key=$(echo "$claim_resp" | jq -r '.kiosk_key')
|
kiosk_key=$(jq -r '.kiosk_key' "$tmpfile")
|
||||||
local kiosk_name
|
local kiosk_name
|
||||||
kiosk_name=$(echo "$claim_resp" | jq -r '.kiosk_name')
|
kiosk_name=$(jq -r '.kiosk_name' "$tmpfile")
|
||||||
|
|
||||||
echo "$kiosk_key" > "$KEY_FILE"
|
echo "$kiosk_key" > "$KEY_FILE"
|
||||||
chmod 600 "$KEY_FILE"
|
chmod 600 "$KEY_FILE"
|
||||||
|
rm -f "$tmpfile"
|
||||||
|
|
||||||
echo "Paired as: ${kiosk_name}"
|
echo "Paired as: ${kiosk_name}"
|
||||||
return
|
return
|
||||||
|
|
@ -111,6 +109,7 @@ pair_with_server() {
|
||||||
|
|
||||||
sleep 2
|
sleep 2
|
||||||
done
|
done
|
||||||
|
rm -f "$tmpfile"
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---- Bundle ------------------------------------------------------------------
|
# ---- Bundle ------------------------------------------------------------------
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue