plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-22 13:11:41 +00:00
Code Issues Projects Releases Wiki Activity

Do not print HTTP responses to stdout

Browse Source
This commit is contained in:
Radek SPRTA 2020-01-22 02:53:50 +01:00
parent 6b67511748
commit 23f2677052
No known key found for this signature in database
GPG Key ID: 03C36A3AA4A06D51
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dnsapi/dns_clouddns.sh
View File

@ -47,8 +47,9 @@ dns_clouddns_add() {
_debug _sub_domain "$_sub_domain" _debug _sub_domain "$_sub_domain"
_debug _domain "$_domain" _debug _domain "$_domain"
_info "Adding record" # Add TXT record
if _clouddns_api POST "record-txt" "{\"type\":\"TXT\",\"name\":\"$fulldomain.\",\"value\":\"$txtvalue\",\"domainId\":\"$_domain_id\"}"; then data="{\"type\":\"TXT\",\"name\":\"$fulldomain.\",\"value\":\"$txtvalue\",\"domainId\":\"$_domain_id\"}"
if _clouddns_api POST "record-txt" "$data"; then
if _contains "$response" "$txtvalue"; then if _contains "$response" "$txtvalue"; then
_info "Added, OK" _info "Added, OK"
elif _contains "$response" '"code":4136'; then elif _contains "$response" '"code":4136'; then
@ -82,8 +83,7 @@ dns_clouddns_rm() {
_debug _domain "$_domain" _debug _domain "$_domain"
# Get record ID # Get record ID
response="$(_clouddns_api GET "domain/$_domain_id" | tr -d '\t\r\n ')" _clouddns_api GET "domain/$_domain_id"
_debug2 response "$response"
if _contains "$response" "lastDomainRecordList"; then if _contains "$response" "lastDomainRecordList"; then
re="\"lastDomainRecordList\".*\"id\":\"([^\"}]*)\"[^}]*\"name\":\"$fulldomain.\"," re="\"lastDomainRecordList\".*\"id\":\"([^\"}]*)\"[^}]*\"name\":\"$fulldomain.\","
_last_domains=$(echo "$response" | _egrep_o "$re") _last_domains=$(echo "$response" | _egrep_o "$re")
@ -119,8 +119,7 @@ _get_root() {
# Get domain root # Get domain root
data="{\"search\": [{\"name\": \"clientId\", \"operator\": \"eq\", \"value\": \"$CLOUDDNS_CLIENT_ID\"}]}" data="{\"search\": [{\"name\": \"clientId\", \"operator\": \"eq\", \"value\": \"$CLOUDDNS_CLIENT_ID\"}]}"
response="$(_clouddns_api "POST" "domain/search" "$data" | tr -d '\t\r\n ')" _clouddns_api "POST" "domain/search" "$data"
_debug2 response "$response"
domain_slice="$domain" domain_slice="$domain"
while [ -z "$domain_root" ]; do while [ -z "$domain_root" ]; do
if _contains "$response" "\"domainName\":\"$domain_slice\.\""; then if _contains "$response" "\"domainName\":\"$domain_slice\.\""; then
@ -133,7 +132,7 @@ _get_root() {
# Get domain id # Get domain id
data="{\"search\": [{\"name\": \"clientId\", \"operator\": \"eq\", \"value\": \"$CLOUDDNS_CLIENT_ID\"}, \ data="{\"search\": [{\"name\": \"clientId\", \"operator\": \"eq\", \"value\": \"$CLOUDDNS_CLIENT_ID\"}, \
{\"name\": \"domainName\", \"operator\": \"eq\", \"value\": \"$domain_root.\"}]}" {\"name\": \"domainName\", \"operator\": \"eq\", \"value\": \"$domain_root.\"}]}"
response="$(_clouddns_api "POST" "domain/search" "$data" | tr -d '\t\r\n ')" _clouddns_api "POST" "domain/search" "$data"
if _contains "$response" "\"id\":\""; then if _contains "$response" "\"id\":\""; then
re='domainType\":\"[^\"]*\",\"id\":\"([^\"]*)\",' # Match domain id re='domainType\":\"[^\"]*\",\"id\":\"([^\"]*)\",' # Match domain id
_domain_id=$(echo "$response" | _egrep_o "$re" | _head_n 1 | cut -d : -f 3 | tr -d "\",") _domain_id=$(echo "$response" | _egrep_o "$re" | _head_n 1 | cut -d : -f 3 | tr -d "\",")
@ -167,9 +166,9 @@ _clouddns_api() {
if [ "$method" != "GET" ]; then if [ "$method" != "GET" ]; then
_debug data "$data" _debug data "$data"
response="$(_post "$data" "$CLOUDDNS_API/$endpoint" "" "$method")" response="$(_post "$data" "$CLOUDDNS_API/$endpoint" "" "$method" | tr -d '\t\r\n ')"
else else
response="$(_get "$CLOUDDNS_API/$endpoint")" response="$(_get "$CLOUDDNS_API/$endpoint" | tr -d '\t\r\n ')"
fi fi
# shellcheck disable=SC2181 # shellcheck disable=SC2181
@ -177,7 +176,7 @@ _clouddns_api() {
_err "Error $endpoint" _err "Error $endpoint"
return 1 return 1
fi fi
printf "%s" "$response" _debug2 response "$response"
return 0 return 0
} }
@ -186,7 +185,6 @@ _clouddns_api() {
_clouddns_login() { _clouddns_login() {
login_data="{\"email\": \"$CLOUDDNS_EMAIL\", \"password\": \"$CLOUDDNS_PASSWORD\"}" login_data="{\"email\": \"$CLOUDDNS_EMAIL\", \"password\": \"$CLOUDDNS_PASSWORD\"}"
response="$(_post "$login_data" "$CLOUDDNS_LOGIN_API" "" "POST" "Content-Type: application/json")" response="$(_post "$login_data" "$CLOUDDNS_LOGIN_API" "" "POST" "Content-Type: application/json")"
_debug2 response "$response"
if _contains "$response" "\"accessToken\":\""; then if _contains "$response" "\"accessToken\":\""; then
CLOUDDNS_TOKEN=$(echo "$response" | _egrep_o "\"accessToken\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \") CLOUDDNS_TOKEN=$(echo "$response" | _egrep_o "\"accessToken\":\"[^\"]*\"" | cut -d : -f 2 | tr -d \")