mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-11-08 23:41:45 +00:00
Merge branch 'dev' of https://github.com/acmesh-official/acme.sh into ssh-deploy
This commit is contained in:
David Kerr
commit
b7b4ae4262
@ -36,7 +36,7 @@ dns_linode_v4_add() {
|
||||
}"
|
||||
|
||||
if _rest POST "/$_domain_id/records" "$_payload" && [ -n "$response" ]; then
|
||||
_resource_id=$(printf "%s\n" "$response" | _egrep_o "\"id\":\s*[0-9]+" | cut -d : -f 2 | tr -d " " | _head_n 1)
|
||||
_resource_id=$(printf "%s\n" "$response" | _egrep_o "\"id\": *[0-9]+" | cut -d : -f 2 | tr -d " " | _head_n 1)
|
||||
_debug _resource_id "$_resource_id"
|
||||
|
||||
if [ -z "$_resource_id" ]; then
|
||||
@ -74,9 +74,9 @@ dns_linode_v4_rm() {
|
||||
if _rest GET "/$_domain_id/records" && [ -n "$response" ]; then
|
||||
response="$(echo "$response" | tr -d "\n" | tr '{' "|" | sed 's/|/&{/g' | tr "|" "\n")"
|
||||
|
||||
resource="$(echo "$response" | _egrep_o "{.*\"name\":\s*\"$_sub_domain\".*}")"
|
||||
resource="$(echo "$response" | _egrep_o "\{.*\"name\": *\"$_sub_domain\".*}")"
|
||||
if [ "$resource" ]; then
|
||||
_resource_id=$(printf "%s\n" "$resource" | _egrep_o "\"id\":\s*[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
|
||||
_resource_id=$(printf "%s\n" "$resource" | _egrep_o "\"id\": *[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
|
||||
if [ "$_resource_id" ]; then
|
||||
_debug _resource_id "$_resource_id"
|
||||
|
||||
@ -139,9 +139,9 @@ _get_root() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
hostedzone="$(echo "$response" | _egrep_o "{.*\"domain\":\s*\"$h\".*}")"
|
||||
hostedzone="$(echo "$response" | _egrep_o "\{.*\"domain\": *\"$h\".*}")"
|
||||
if [ "$hostedzone" ]; then
|
||||
_domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o "\"id\":\s*[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
|
||||
_domain_id=$(printf "%s\n" "$hostedzone" | _egrep_o "\"id\": *[0-9]+" | _head_n 1 | cut -d : -f 2 | tr -d \ )
|
||||
if [ "$_domain_id" ]; then
|
||||
_sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p)
|
||||
_domain=$h
|
||||
|
||||
@ -6,6 +6,9 @@
|
||||
# Values to export:
|
||||
# export PDD_Token="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
||||
|
||||
# Sometimes cloudflare / google doesn't pick new dns records fast enough.
|
||||
# You can add --dnssleep XX to params as workaround.
|
||||
|
||||
######## Public functions #####################
|
||||
|
||||
#Usage: dns_myapi_add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs"
|
||||
@ -13,97 +16,106 @@ dns_yandex_add() {
|
||||
fulldomain="${1}"
|
||||
txtvalue="${2}"
|
||||
_debug "Calling: dns_yandex_add() '${fulldomain}' '${txtvalue}'"
|
||||
_PDD_credentials || return 1
|
||||
export _H1="PddToken: $PDD_Token"
|
||||
|
||||
_PDD_get_domain "$fulldomain" || return 1
|
||||
_debug "Found suitable domain in pdd: $curDomain"
|
||||
curData="domain=${curDomain}&type=TXT&subdomain=${curSubdomain}&ttl=360&content=${txtvalue}"
|
||||
curUri="https://pddimp.yandex.ru/api2/admin/dns/add"
|
||||
curResult="$(_post "${curData}" "${curUri}")"
|
||||
_debug "Result: $curResult"
|
||||
_PDD_credentials || return 1
|
||||
|
||||
_PDD_get_domain || return 1
|
||||
_debug "Found suitable domain: $domain"
|
||||
|
||||
_PDD_get_record_ids || return 1
|
||||
_debug "Record_ids: $record_ids"
|
||||
|
||||
if [ ! -z "$record_ids" ]; then
|
||||
_info "All existing $subdomain records from $domain will be removed at the very end."
|
||||
fi
|
||||
|
||||
data="domain=${domain}&type=TXT&subdomain=${subdomain}&ttl=300&content=${txtvalue}"
|
||||
uri="https://pddimp.yandex.ru/api2/admin/dns/add"
|
||||
result="$(_post "${data}" "${uri}" | _normalizeJson)"
|
||||
_debug "Result: $result"
|
||||
|
||||
if ! _contains "$result" '"success":"ok"'; then
|
||||
if _contains "$result" '"success":"error"' && _contains "$result" '"error":"record_exists"'; then
|
||||
_info "Record already exists."
|
||||
else
|
||||
_err "Can't add $subdomain to $domain."
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
#Usage: dns_myapi_rm _acme-challenge.www.domain.com
|
||||
dns_yandex_rm() {
|
||||
fulldomain="${1}"
|
||||
_debug "Calling: dns_yandex_rm() '${fulldomain}'"
|
||||
|
||||
_PDD_credentials || return 1
|
||||
export _H1="PddToken: $PDD_Token"
|
||||
|
||||
_PDD_get_domain "$fulldomain" || return 1
|
||||
_debug "Found suitable domain in pdd: $curDomain"
|
||||
_debug "Found suitable domain: $domain"
|
||||
|
||||
record_id=$(pdd_get_record_id "${fulldomain}")
|
||||
_debug "Result: $record_id"
|
||||
_PDD_get_record_ids "${domain}" "${subdomain}" || return 1
|
||||
_debug "Record_ids: $record_ids"
|
||||
|
||||
for rec_i in $record_id; do
|
||||
curUri="https://pddimp.yandex.ru/api2/admin/dns/del"
|
||||
curData="domain=${curDomain}&record_id=${rec_i}"
|
||||
curResult="$(_post "${curData}" "${curUri}")"
|
||||
_debug "Result: $curResult"
|
||||
for record_id in $record_ids; do
|
||||
data="domain=${domain}&record_id=${record_id}"
|
||||
uri="https://pddimp.yandex.ru/api2/admin/dns/del"
|
||||
result="$(_post "${data}" "${uri}" | _normalizeJson)"
|
||||
_debug "Result: $result"
|
||||
|
||||
if ! _contains "$result" '"success":"ok"'; then
|
||||
_info "Can't remove $subdomain from $domain."
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
#################### Private functions below ##################################
|
||||
|
||||
_PDD_get_domain() {
|
||||
fulldomain="${1}"
|
||||
__page=1
|
||||
__last=0
|
||||
while [ $__last -eq 0 ]; do
|
||||
uri1="https://pddimp.yandex.ru/api2/admin/domain/domains?page=${__page}&on_page=20"
|
||||
res1="$(_get "$uri1" | _normalizeJson)"
|
||||
_debug2 "res1" "$res1"
|
||||
__found="$(echo "$res1" | sed -n -e 's#.* "found": \([^,]*\),.*#\1#p')"
|
||||
_debug "found: $__found results on page"
|
||||
if [ "0$__found" -lt 20 ]; then
|
||||
_debug "last page: $__page"
|
||||
__last=1
|
||||
subdomain_start=1
|
||||
while true; do
|
||||
domain_start=$(_math $subdomain_start + 1)
|
||||
domain=$(echo "$fulldomain" | cut -d . -f "$domain_start"-)
|
||||
subdomain=$(echo "$fulldomain" | cut -d . -f -"$subdomain_start")
|
||||
|
||||
_debug "Checking domain $domain"
|
||||
if [ -z "$domain" ]; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
__all_domains="$__all_domains $(echo "$res1" | tr "," "\n" | grep '"name"' | cut -d: -f2 | sed -e 's@"@@g')"
|
||||
uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=$domain"
|
||||
result="$(_get "${uri}" | _normalizeJson)"
|
||||
_debug "Result: $result"
|
||||
|
||||
__page=$(_math $__page + 1)
|
||||
if _contains "$result" '"success":"ok"'; then
|
||||
return 0
|
||||
fi
|
||||
subdomain_start=$(_math $subdomain_start + 1)
|
||||
done
|
||||
|
||||
k=2
|
||||
while [ $k -lt 10 ]; do
|
||||
__t=$(echo "$fulldomain" | cut -d . -f $k-100)
|
||||
_debug "finding zone for domain $__t"
|
||||
for d in $__all_domains; do
|
||||
if [ "$d" = "$__t" ]; then
|
||||
p=$(_math $k - 1)
|
||||
curSubdomain="$(echo "$fulldomain" | cut -d . -f "1-$p")"
|
||||
curDomain="$__t"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
k=$(_math $k + 1)
|
||||
done
|
||||
_err "No suitable domain found in your account"
|
||||
return 1
|
||||
}
|
||||
|
||||
_PDD_credentials() {
|
||||
if [ -z "${PDD_Token}" ]; then
|
||||
PDD_Token=""
|
||||
_err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx"
|
||||
_err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token"
|
||||
_err "You need to export PDD_Token=xxxxxxxxxxxxxxxxx."
|
||||
_err "You can get it at https://pddimp.yandex.ru/api2/admin/get_token."
|
||||
return 1
|
||||
else
|
||||
_saveaccountconf PDD_Token "${PDD_Token}"
|
||||
fi
|
||||
export _H1="PddToken: $PDD_Token"
|
||||
}
|
||||
|
||||
pdd_get_record_id() {
|
||||
fulldomain="${1}"
|
||||
_PDD_get_record_ids() {
|
||||
_debug "Check existing records for $subdomain"
|
||||
|
||||
_PDD_get_domain "$fulldomain"
|
||||
_debug "Found suitable domain in pdd: $curDomain"
|
||||
uri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${domain}"
|
||||
result="$(_get "${uri}" | _normalizeJson)"
|
||||
_debug "Result: $result"
|
||||
|
||||
curUri="https://pddimp.yandex.ru/api2/admin/dns/list?domain=${curDomain}"
|
||||
curResult="$(_get "${curUri}" | _normalizeJson)"
|
||||
_debug "Result: $curResult"
|
||||
echo "$curResult" | _egrep_o "{[^{]*\"content\":[^{]*\"subdomain\":\"${curSubdomain}\"" | sed -n -e 's#.* "record_id": \(.*\),[^,]*#\1#p'
|
||||
if ! _contains "$result" '"success":"ok"'; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
record_ids=$(echo "$result" | _egrep_o "{[^{]*\"subdomain\":\"${subdomain}\"[^}]*}" | sed -n -e 's#.*"record_id": \([0-9]*\).*#\1#p')
|
||||
}
|
||||
|
||||
64
notify/cqhttp.sh
Normal file
64
notify/cqhttp.sh
Normal file
@ -0,0 +1,64 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#Support for CQHTTP api. Push notification on CoolQ
|
||||
#CQHTTP_TOKEN="" Recommended to be not empty, QQ application token
|
||||
#CQHTTP_USER="" Required, QQ receiver ID
|
||||
#CQHTTP_APIROOT="" Required, CQHTTP Server URL (without slash suffix)
|
||||
#CQHTTP_CUSTOM_MSGHEAD="" Optional, custom message header
|
||||
|
||||
CQHTTP_APIPATH="/send_private_msg"
|
||||
|
||||
cqhttp_send() {
|
||||
_subject="$1"
|
||||
_content="$2"
|
||||
_statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped
|
||||
_debug "_statusCode" "$_statusCode"
|
||||
|
||||
CQHTTP_TOKEN="${CQHTTP_TOKEN:-$(_readaccountconf_mutable CQHTTP_TOKEN)}"
|
||||
if [ -z "$CQHTTP_TOKEN" ]; then
|
||||
CQHTTP_TOKEN=""
|
||||
_info "You didn't specify a CQHTTP application token yet, which is unsafe. Assuming it to be empty."
|
||||
else
|
||||
_saveaccountconf_mutable CQHTTP_TOKEN "$CQHTTP_TOKEN"
|
||||
fi
|
||||
|
||||
CQHTTP_USER="${CQHTTP_USER:-$(_readaccountconf_mutable CQHTTP_USER)}"
|
||||
if [ -z "$CQHTTP_USER" ]; then
|
||||
CQHTTP_USER=""
|
||||
_err "You didn't specify a QQ user yet."
|
||||
return 1
|
||||
fi
|
||||
_saveaccountconf_mutable CQHTTP_USER "$CQHTTP_USER"
|
||||
|
||||
CQHTTP_APIROOT="${CQHTTP_APIROOT:-$(_readaccountconf_mutable CQHTTP_APIROOT)}"
|
||||
if [ -z "$CQHTTP_APIROOT" ]; then
|
||||
CQHTTP_APIROOT=""
|
||||
_err "You didn't specify the API root yet."
|
||||
return 1
|
||||
fi
|
||||
_saveaccountconf_mutable CQHTTP_APIROOT "$CQHTTP_APIROOT"
|
||||
|
||||
CQHTTP_CUSTOM_MSGHEAD="${CQHTTP_CUSTOM_MSGHEAD:-$(_readaccountconf_mutable CQHTTP_CUSTOM_MSGHEAD)}"
|
||||
if [ -z "$CQHTTP_CUSTOM_MSGHEAD" ]; then
|
||||
CQHTTP_CUSTOM_MSGHEAD="A message from acme.sh:"
|
||||
else
|
||||
_saveaccountconf_mutable CQHTTP_CUSTOM_MSGHEAD "$CQHTTP_CUSTOM_MSGHEAD"
|
||||
fi
|
||||
|
||||
_access_token="$(printf "%s" "$CQHTTP_TOKEN" | _url_encode)"
|
||||
_user_id="$(printf "%s" "$CQHTTP_USER" | _url_encode)"
|
||||
_message="$(printf "$CQHTTP_CUSTOM_MSGHEAD %s\\n%s" "$_subject" "$_content" | _url_encode)"
|
||||
|
||||
_finalUrl="$CQHTTP_APIROOT$CQHTTP_APIPATH?access_token=$_access_token&user_id=$_user_id&message=$_message"
|
||||
response="$(_get "$_finalUrl")"
|
||||
|
||||
if [ "$?" = "0" ] && _contains "$response" "\"retcode\":0,\"status\":\"ok\""; then
|
||||
_info "QQ send success."
|
||||
return 0
|
||||
fi
|
||||
|
||||
_err "QQ send error."
|
||||
_debug "URL" "$_finalUrl"
|
||||
_debug "Response" "$response"
|
||||
return 1
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user