yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-05 23:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quoting the vars

Browse Source
This commit is contained in:
hyper 2016-11-21 09:14:09 +01:00 committed by sjau
parent 220e1ccef9
commit 43162cce54
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dnsapi/dns_ispconfig.sh
View File

@ -43,7 +43,7 @@ _ISPC_login() {
curData="{\"username\":\"${ISPC_User}\",\"password\":\"${ISPC_Password}\",\"client_login\":false}" curData="{\"username\":\"${ISPC_User}\",\"password\":\"${ISPC_Password}\",\"client_login\":false}"
curResult=$(curl -k --data "${curData}" "${ISPC_Api}?login") curResult=$(curl -k --data "${curData}" "${ISPC_Api}?login")
if _contains "${curResult}" '"code":"ok"'; then if _contains "${curResult}" '"code":"ok"'; then
sessionID=$(echo $curResult | _egrep_o "response.*" | cut -d ':' -f 2) sessionID=$(echo "${curResult}" | _egrep_o "response.*" | cut -d ':' -f 2)
sessionID=${sessionID:1:-2} sessionID=${sessionID:1:-2}
_info "Successfully retrieved Session ID." _info "Successfully retrieved Session ID."
else else
@ -72,19 +72,19 @@ _ISPC_getZoneInfo () {
fi fi
done done
if [ ${zoneFound} ]; then if [ ${zoneFound} ]; then
server_id=$(echo $curResult | _egrep_o "server_id.*" | cut -d ':' -f 2) server_id=$(echo "${curResult}" | _egrep_o "server_id.*" | cut -d ':' -f 2)
server_id=${server_id:1:-10} server_id=${server_id:1:-10}
case ${server_id} in case ${server_id} in
''|*[!0-9]*) _err "Server ID is not numeric. Aborting" ;; ''|*[!0-9]*) _err "Server ID is not numeric. Aborting" ;;
*) _info "Successfully retrieved Server ID" ;; *) _info "Successfully retrieved Server ID" ;;
esac esac
zone=$(echo $curResult | _egrep_o "\"id.*" | cut -d ':' -f 2) zone=$(echo "${curResult}" | _egrep_o "\"id.*" | cut -d ':' -f 2)
zone=${zone:1:-14} zone=${zone:1:-14}
case ${zone} in case ${zone} in
''|*[!0-9]*) _err "Zone ID is not numeric. Aborting" ;; ''|*[!0-9]*) _err "Zone ID is not numeric. Aborting" ;;
*) _info "Successfully retrieved Zone ID" ;; *) _info "Successfully retrieved Zone ID" ;;
esac esac
client_id=$(echo $curResult | _egrep_o "sys_userid.*" | cut -d ':' -f 2) client_id=$(echo "${curResult}" | _egrep_o "sys_userid.*" | cut -d ':' -f 2)
client_id=${client_id:1:-15} client_id=${client_id:1:-15}
case ${client_id} in case ${client_id} in
''|*[!0-9]*) _err "Client ID is not numeric. Aborting" ;; ''|*[!0-9]*) _err "Client ID is not numeric. Aborting" ;;
@ -101,7 +101,7 @@ _ISPC_addTxt () {
params="\"server_id\":\"${server_id}\",\"zone\":\"${zone}\",\"name\":\"${fulldomain}\",\"type\":\"txt\",\"data\":\"${txtvalue}\",\"aux\":\"0\",\"ttl\":\"3600\",\"active\":\"y\",\"stamp\":\"${curStamp}\",\"serial\":\"${curSerial}\"" params="\"server_id\":\"${server_id}\",\"zone\":\"${zone}\",\"name\":\"${fulldomain}\",\"type\":\"txt\",\"data\":\"${txtvalue}\",\"aux\":\"0\",\"ttl\":\"3600\",\"active\":\"y\",\"stamp\":\"${curStamp}\",\"serial\":\"${curSerial}\""
curData="{\"session_id\":\"${sessionID}\",\"client_id\":\"${client_id}\",\"params\":{${params}}}" curData="{\"session_id\":\"${sessionID}\",\"client_id\":\"${client_id}\",\"params\":{${params}}}"
curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_txt_add") curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_txt_add")
record_id=$(echo $curResult | _egrep_o "\"response.*" | cut -d ':' -f 2) record_id=$(echo "${curResult}" | _egrep_o "\"response.*" | cut -d ':' -f 2)
record_id=${record_id:1:-2} record_id=${record_id:1:-2}
case ${record_id} in case ${record_id} in
''|*[!0-9]*) _err "Record ID is not numeric. Aborting" ;; ''|*[!0-9]*) _err "Record ID is not numeric. Aborting" ;;
@ -115,7 +115,6 @@ _ISPC_rmTxt () {
for i in $record_data; do for i in $record_data; do
curData="{\"session_id\":\"${sessionID}\",\"primary_id\":\"${i}\"}" curData="{\"session_id\":\"${sessionID}\",\"primary_id\":\"${i}\"}"
curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_txt_delete") curResult=$(curl -k --data "${curData}" "${ISPC_Api}?dns_txt_delete")
echo $curResult;
if _contains "${curResult}" '"code":"ok"'; then if _contains "${curResult}" '"code":"ok"'; then
_info "Successfully removed ACME challenge txt record." _info "Successfully removed ACME challenge txt record."
else else