Browse Source
sync (#2404)
sync (#2404)
* support jdcloud.com * fix format * ttl 3000 * Escape slashes (#2375) * Change 1.1.1.1 to 1.0.0.1 to probe compatibility (#2330) As we can see, 1.1.1.1 is not routed or routed to an Intranet devices due to historical reason. Change 1.1.1.1 to 1.0.0.1 will have a better compatibility. I found this problem on my Tencent Cloud server. * check empty id * fix error * Add dnsapi for Vultr (#2370) * Add Vultr dns api * PushOver notifications (#2325) * PushOver notifications, using AppToken, UserKey, and optional sounds * fix errors * added dns api support for hexonet (#1776) * update * minor * support new Cloudflare Token format fix https://github.com/Neilpang/acme.sh/issues/2398 * fix wildcard domain name * add more info * fix https://github.com/Neilpang/acme.sh/issues/2377 * fix format * fix formatpull/2419/head
neil
5 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 443 additions and 49 deletions
-
6acme.sh
-
4deploy/docker.sh
-
55dnsapi/dns_cf.sh
-
156dnsapi/dns_hexonet.sh
-
2dnsapi/dns_namecheap.sh
-
9dnsapi/dns_namesilo.sh
-
163dnsapi/dns_vultr.sh
-
63notify/pushover.sh
@ -0,0 +1,156 @@ |
|||
#!/usr/bin/env sh |
|||
|
|||
# |
|||
# Hexonet_Login="username!roleId" |
|||
# |
|||
# Hexonet_Password="rolePassword" |
|||
|
|||
Hexonet_Api="https://coreapi.1api.net/api/call.cgi" |
|||
|
|||
######## Public functions ##################### |
|||
|
|||
#Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" |
|||
dns_hexonet_add() { |
|||
fulldomain=$1 |
|||
txtvalue=$2 |
|||
|
|||
Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}" |
|||
Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}" |
|||
if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then |
|||
Hexonet_Login="" |
|||
Hexonet_Password="" |
|||
_err "You must export variables: Hexonet_Login and Hexonet_Password" |
|||
return 1 |
|||
fi |
|||
|
|||
if ! _contains "$Hexonet_Login" "!"; then |
|||
_err "It seems that the Hexonet_Login=$Hexonet_Login is not a restrivteed user." |
|||
_err "Please check and retry." |
|||
return 1 |
|||
fi |
|||
|
|||
#save the username and password to the account conf file. |
|||
_saveaccountconf_mutable Hexonet_Login "$Hexonet_Login" |
|||
_saveaccountconf_mutable Hexonet_Password "$Hexonet_Password" |
|||
|
|||
_debug "First detect the root zone" |
|||
if ! _get_root "$fulldomain"; then |
|||
_err "invalid domain" |
|||
return 1 |
|||
fi |
|||
_debug _sub_domain "$_sub_domain" |
|||
_debug _domain "$_domain" |
|||
|
|||
_debug "Getting txt records" |
|||
_hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT" |
|||
|
|||
if ! _contains "$response" "CODE=200"; then |
|||
_err "Error" |
|||
return 1 |
|||
fi |
|||
|
|||
_info "Adding record" |
|||
if _hexonet_rest "command=UpdateDNSZone&dnszone=${_domain}.&addrr0=${_sub_domain}%20IN%20TXT%20${txtvalue}"; then |
|||
if _contains "$response" "CODE=200"; then |
|||
_info "Added, OK" |
|||
return 0 |
|||
else |
|||
_err "Add txt record error." |
|||
return 1 |
|||
fi |
|||
fi |
|||
_err "Add txt record error." |
|||
return 1 |
|||
|
|||
} |
|||
|
|||
#fulldomain txtvalue |
|||
dns_hexonet_rm() { |
|||
fulldomain=$1 |
|||
txtvalue=$2 |
|||
|
|||
Hexonet_Login="${Hexonet_Login:-$(_readaccountconf_mutable Hexonet_Login)}" |
|||
Hexonet_Password="${Hexonet_Password:-$(_readaccountconf_mutable Hexonet_Password)}" |
|||
if [ -z "$Hexonet_Login" ] || [ -z "$Hexonet_Password" ]; then |
|||
Hexonet_Login="" |
|||
Hexonet_Password="" |
|||
_err "You must export variables: Hexonet_Login and Hexonet_Password" |
|||
return 1 |
|||
fi |
|||
|
|||
_debug "First detect the root zone" |
|||
if ! _get_root "$fulldomain"; then |
|||
_err "invalid domain" |
|||
return 1 |
|||
fi |
|||
|
|||
_debug _sub_domain "$_sub_domain" |
|||
_debug _domain "$_domain" |
|||
|
|||
_debug "Getting txt records" |
|||
_hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}.&RRTYPE=TXT&RR=${txtvalue}" |
|||
|
|||
if ! _contains "$response" "CODE=200"; then |
|||
_err "Error" |
|||
return 1 |
|||
fi |
|||
|
|||
count=$(printf "%s\n" "$response" | _egrep_o "PROPERTY[TOTAL][0]=" | cut -d = -f 2) |
|||
_debug count "$count" |
|||
if [ "$count" = "0" ]; then |
|||
_info "Don't need to remove." |
|||
else |
|||
if ! _hexonet_rest "&command=UpdateDNSZone&dnszone=${_domain}.&delrr0='${_sub_domain}%20IN%20TXT%20\"${txtvalue}\""; then |
|||
_err "Delete record error." |
|||
return 1 |
|||
fi |
|||
_contains "$response" "CODE=200" |
|||
fi |
|||
|
|||
} |
|||
|
|||
#################### Private functions below ################################## |
|||
#_acme-challenge.www.domain.com |
|||
#returns |
|||
# _sub_domain=_acme-challenge.www |
|||
# _domain=domain.com |
|||
_get_root() { |
|||
domain=$1 |
|||
i=1 |
|||
p=1 |
|||
while true; do |
|||
h=$(printf "%s" "$domain" | cut -d . -f $i-100) |
|||
_debug h "$h" |
|||
if [ -z "$h" ]; then |
|||
#not valid |
|||
return 1 |
|||
fi |
|||
|
|||
if ! _hexonet_rest "&command=QueryDNSZoneRRList&dnszone=${h}."; then |
|||
return 1 |
|||
fi |
|||
|
|||
if _contains "$response" "CODE=200"; then |
|||
_sub_domain=$(printf "%s" "$domain" | cut -d . -f 1-$p) |
|||
_domain=$h |
|||
return 0 |
|||
fi |
|||
p=$i |
|||
i=$(_math "$i" + 1) |
|||
done |
|||
return 1 |
|||
} |
|||
|
|||
_hexonet_rest() { |
|||
query_params="$1" |
|||
_debug "$query_params" |
|||
|
|||
response="$(_get "${Hexonet_Api}?s_login=${Hexonet_Login}&s_pw=${Hexonet_Password}&${query_params}")" |
|||
|
|||
if [ "$?" != "0" ]; then |
|||
_err "error $query_params" |
|||
return 1 |
|||
fi |
|||
_debug2 response "$response" |
|||
return 0 |
|||
} |
|||
@ -0,0 +1,163 @@ |
|||
#!/usr/bin/env sh |
|||
|
|||
# |
|||
#VULTR_API_KEY=000011112222333344445555666677778888 |
|||
|
|||
VULTR_Api="https://api.vultr.com/v1" |
|||
|
|||
######## Public functions ##################### |
|||
|
|||
#Usage: add _acme-challenge.www.domain.com "XKrxpRBosdIKFzxW_CT3KLZNf6q0HG9i01zxXp5CPBs" |
|||
dns_vultr_add() { |
|||
fulldomain=$1 |
|||
txtvalue=$2 |
|||
_debug fulldomain "$fulldomain" |
|||
_debug txtvalue "$txtvalue" |
|||
|
|||
VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}" |
|||
if test -z "$VULTR_API_KEY"; then |
|||
VULTR_API_KEY='' |
|||
_err 'VULTR_API_KEY was not exported' |
|||
return 1 |
|||
fi |
|||
|
|||
_saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY" |
|||
|
|||
_debug 'First detect the root zone' |
|||
if ! _get_root "$fulldomain"; then |
|||
return 1 |
|||
fi |
|||
_debug _sub_domain "$_sub_domain" |
|||
_debug _domain "$_domain" |
|||
|
|||
_debug 'Getting txt records' |
|||
_vultr_rest GET "dns/records?domain=$_domain" |
|||
|
|||
if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then |
|||
_err 'Error' |
|||
return 1 |
|||
fi |
|||
|
|||
if ! _vultr_rest POST 'dns/create_record' "domain=$_domain&name=$_sub_domain&data=\"$txtvalue\"&type=TXT"; then |
|||
_err "$response" |
|||
return 1 |
|||
fi |
|||
|
|||
_debug2 _response "$response" |
|||
return 0 |
|||
} |
|||
|
|||
#fulldomain txtvalue |
|||
dns_vultr_rm() { |
|||
fulldomain=$1 |
|||
txtvalue=$2 |
|||
_debug fulldomain "$fulldomain" |
|||
_debug txtvalue "$txtvalue" |
|||
|
|||
VULTR_API_KEY="${VULTR_API_KEY:-$(_readaccountconf_mutable VULTR_API_KEY)}" |
|||
if test -z "$VULTR_API_KEY"; then |
|||
VULTR_API_KEY="" |
|||
_err 'VULTR_API_KEY was not exported' |
|||
return 1 |
|||
fi |
|||
|
|||
_saveaccountconf_mutable VULTR_API_KEY "$VULTR_API_KEY" |
|||
|
|||
_debug 'First detect the root zone' |
|||
if ! _get_root "$fulldomain"; then |
|||
return 1 |
|||
fi |
|||
_debug _sub_domain "$_sub_domain" |
|||
_debug _domain "$_domain" |
|||
|
|||
_debug 'Getting txt records' |
|||
_vultr_rest GET "dns/records?domain=$_domain" |
|||
|
|||
if printf "%s\n" "$response" | grep "\"type\":\"TXT\",\"name\":\"$fulldomain\"" >/dev/null; then |
|||
_err 'Error' |
|||
return 1 |
|||
fi |
|||
|
|||
_record_id="$(echo "$response" | tr '{}' '\n' | grep '"TXT"' | grep "$txtvalue" | tr ',' '\n' | grep -i 'RECORDID' | cut -d : -f 2)" |
|||
_debug _record_id "$_record_id" |
|||
if [ "$_record_id" ]; then |
|||
_info "Successfully retrieved the record id for ACME challenge." |
|||
else |
|||
_info "Empty record id, it seems no such record." |
|||
return 0 |
|||
fi |
|||
|
|||
if ! _vultr_rest POST 'dns/delete_record' "domain=$_domain&RECORDID=$_record_id"; then |
|||
_err "$response" |
|||
return 1 |
|||
fi |
|||
|
|||
_debug2 _response "$response" |
|||
return 0 |
|||
} |
|||
|
|||
#################### Private functions below ################################## |
|||
#_acme-challenge.www.domain.com |
|||
#returns |
|||
# _sub_domain=_acme-challenge.www |
|||
# _domain=domain.com |
|||
# _domain_id=sdjkglgdfewsdfg |
|||
_get_root() { |
|||
domain=$1 |
|||
i=1 |
|||
while true; do |
|||
h=$(printf "%s" "$domain" | cut -d . -f $i-100) |
|||
_debug h "$h" |
|||
if [ -z "$h" ]; then |
|||
return 1 |
|||
fi |
|||
|
|||
if ! _vultr_rest GET "dns/list"; then |
|||
return 1 |
|||
fi |
|||
|
|||
if printf "%s\n" "$response" | grep '^\[.*\]' >/dev/null; then |
|||
if _contains "$response" "\"domain\":\"$_domain\""; then |
|||
_sub_domain="$(echo "$fulldomain" | sed "s/\\.$_domain\$//")" |
|||
_domain=$_domain |
|||
return 0 |
|||
else |
|||
_err 'Invalid domain' |
|||
return 1 |
|||
fi |
|||
else |
|||
_err "$response" |
|||
return 1 |
|||
fi |
|||
i=$(_math "$i" + 1) |
|||
done |
|||
|
|||
return 1 |
|||
} |
|||
|
|||
_vultr_rest() { |
|||
m=$1 |
|||
ep="$2" |
|||
data="$3" |
|||
_debug "$ep" |
|||
|
|||
api_key_trimmed=$(echo $VULTR_API_KEY | tr -d '"') |
|||
|
|||
export _H1="Api-Key: $api_key_trimmed" |
|||
export _H2='Content-Type: application/x-www-form-urlencoded' |
|||
|
|||
if [ "$m" != "GET" ]; then |
|||
_debug data "$data" |
|||
response="$(_post "$data" "$VULTR_Api/$ep" "" "$m")" |
|||
else |
|||
response="$(_get "$VULTR_Api/$ep")" |
|||
fi |
|||
|
|||
if [ "$?" != "0" ]; then |
|||
_err "Error $ep" |
|||
return 1 |
|||
fi |
|||
|
|||
_debug2 response "$response" |
|||
return 0 |
|||
} |
|||
@ -0,0 +1,63 @@ |
|||
#!/usr/bin/env sh |
|||
|
|||
#Support for pushover.net's api. Push notification platform for multiple platforms |
|||
#PUSHOVER_TOKEN="" Required, pushover application token |
|||
#PUSHOVER_USER="" Required, pushover userkey |
|||
#PUSHOVER_DEVICE="" Optional, Specific device or devices by hostnames, joining multiples with a comma (such as device=iphone,nexus5) |
|||
#PUSHOVER_PRIORITY="" Optional, Lowest Priority (-2), Low Priority (-1), Normal Priority (0), High Priority (1) |
|||
|
|||
PUSHOVER_URI="https://api.pushover.net/1/messages.json" |
|||
|
|||
pushover_send() { |
|||
_subject="$1" |
|||
_content="$2" |
|||
_statusCode="$3" #0: success, 1: error 2($RENEW_SKIP): skipped |
|||
_debug "_statusCode" "$_statusCode" |
|||
|
|||
PUSHOVER_TOKEN="${PUSHOVER_TOKEN:-$(_readaccountconf_mutable PUSHOVER_TOKEN)}" |
|||
if [ -z "$PUSHOVER_TOKEN" ]; then |
|||
PUSHOVER_TOKEN="" |
|||
_err "You didn't specify a PushOver application token yet." |
|||
return 1 |
|||
fi |
|||
_saveaccountconf_mutable PUSHOVER_TOKEN "$PUSHOVER_TOKEN" |
|||
|
|||
PUSHOVER_USER="${PUSHOVER_USER:-$(_readaccountconf_mutable PUSHOVER_USER)}" |
|||
if [ -z "$PUSHOVER_USER" ]; then |
|||
PUSHOVER_USER="" |
|||
_err "You didn't specify a PushOver UserKey yet." |
|||
return 1 |
|||
fi |
|||
_saveaccountconf_mutable PUSHOVER_USER "$PUSHOVER_USER" |
|||
|
|||
PUSHOVER_DEVICE="${PUSHOVER_DEVICE:-$(_readaccountconf_mutable PUSHOVER_DEVICE)}" |
|||
if [ "$PUSHOVER_DEVICE" ]; then |
|||
_saveaccountconf_mutable PUSHOVER_DEVICE "$PUSHOVER_DEVICE" |
|||
fi |
|||
|
|||
PUSHOVER_PRIORITY="${PUSHOVER_PRIORITY:-$(_readaccountconf_mutable PUSHOVER_PRIORITY)}" |
|||
if [ "$PUSHOVER_PRIORITY" ]; then |
|||
_saveaccountconf_mutable PUSHOVER_PRIORITY "$PUSHOVER_PRIORITY" |
|||
fi |
|||
|
|||
PUSHOVER_SOUND="${PUSHOVER_SOUND:-$(_readaccountconf_mutable PUSHOVER_SOUND)}" |
|||
if [ "$PUSHOVER_SOUND" ]; then |
|||
_saveaccountconf_mutable PUSHOVER_SOUND "$PUSHOVER_SOUND" |
|||
fi |
|||
|
|||
export _H1="Content-Type: application/json" |
|||
_content="$(printf "*%s*\n" "$_content" | _json_encode)" |
|||
_subject="$(printf "*%s*\n" "$_subject" | _json_encode)" |
|||
_data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}" |
|||
|
|||
response="" #just make shellcheck happy |
|||
if _post "$_data" "$PUSHOVER_URI"; then |
|||
if _contains "$response" "{\"status\":1"; then |
|||
_info "PUSHOVER send success." |
|||
return 0 |
|||
fi |
|||
fi |
|||
_err "PUSHOVER send error." |
|||
_err "$response" |
|||
return 1 |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue